Merge branch 'integration' into kraikrit

www/src/Locale/en_EN/default.po

@@ -169,9 +169,6 @@ msgid "submit"
 msgstr "Submit"
 
 #: Controller/UsersController.php/change_forgotpassword.ctp:49
-msgid "Please enter only English letters and numbers."
-msgstr "Please enter only English letters and numbers."
-
 #: Controller/UsersController.php/change_forgotpassword.ctp:58
 msgid "Please enter only English letters and numbers."
 msgstr "Please enter only English letters and numbers."
@@ -198,4 +195,126 @@ msgstr "Please provide the same password."
 
 #: Controller/UsersController.php/change_forgotpassword.ctp:3
 msgid "change password"
-msgstr "change password"
\ No newline at end of file
+msgstr "change password"
+
+#: Controller/UsersController.php:444
+msgid "You are now logged out."
+msgstr "You are now logged out."
+
+#: Controller/UsersController.php:391
+msgid "Pin Completed."
+msgstr "Pin Completed."
+
+#: Controller/UsersController.php:394
+msgid "Pin Invalid."
+msgstr "Pin Invalid."
+
+#: Controller/UsersController.php:369
+msgid "send password to email success."
+msgstr "Send password to email success."
+
+#: Controller/UsersController.php:374
+msgid "Invalid Email."
+msgstr "Invalid Email."
+
+
+
+#: Controller/UserCardsController.php/view_card.ctp:21
+msgid "id"
+msgstr "Id"
+
+#: Controller/UserCardsController.php/view_card.ctp:27
+msgid "Name"
+msgstr "Name"
+
+#: Controller/UserCardsController.php/view_card.ctp:37
+#: Controller/UserCardsController.php/view_card.ctp:105
+msgid "Position"
+msgstr "Position"
+
+#: Controller/UserCardsController.php/view_card.ctp:60
+#: Controller/UserCardsController.php/view_card.ctp:111
+msgid "Card issue"
+msgstr "Card issue"
+
+#: Controller/UserCardsController.php/view_card.ctp:63
+#: Controller/UserCardsController.php/view_card.ctp:121
+msgid "Old age"
+msgstr "Old age"
+
+#: Controller/UserCardsController.php/view_card.ctp:76
+msgid "Company Information"
+msgstr "Company Information"
+
+#: Controller/UserCardsController.php/view_card.ctp:81
+msgid "Firstname"
+msgstr "Firstname"
+
+#: Controller/UserCardsController.php/view_card.ctp:87
+msgid "Lastname"
+msgstr "Lastname"
+
+#: Controller/UserCardsController.php/view_card.ctp:93
+msgid "Company Name"
+msgstr "Company Name"
+
+#: Controller/UserCardsController.php/view_card.ctp:99
+msgid "Department"
+msgstr "Department"
+
+#: Controller/UserCardsController.php/view_card.ctp:177
+msgid "Ref 2"
+msgstr "Ref 2"
+
+#: Controller/UserCardsController.php/view_card.ctp:185
+msgid "Check"
+msgstr "Check"
+
+#: Controller/UserCardsController.php/view_card.ctp:515
+msgid "Register with"
+msgstr "Register with"
+
+#: Controller/UserCardsController.php/view_card.ctp:516
+msgid "already"
+msgstr "Already"
+
+#: Controller/UserCardsController.php/view_card.ctp:530
+#: Controller/UserCardsController:313 
+msgid "Data not found"
+msgstr "Data not found"
+
+#: Controller/UserCardsController.php/view_card.ctp:550
+msgid "Registered"
+msgstr "Registered"
+
+#: Controller/UserCardsController.php/view_card.ctp:564
+msgid "Did not find the information you need", Please enter the correct information and press the check."
+msgstr "Did not find the information you need", Please enter the correct information and press the check."
+
+#: Controller/UserCardsController.php/view_card.ctp:576
+msgid "Please enter Company Code."
+msgstr "Please enter Company Code."
+
+#: Controller/UserCardsController.php/view_card.ctp:581
+msgid "Please enter Ref1."
+msgstr "Please enter Ref1."
+
+#: Controller/UserCardsController.php/view_card.ctp:586
+msgid "Please enter Ref2."
+msgstr "Please enter Ref2."
+
+#: Controller/UserCardsController.php/view_card.ctp:161
+msgid "ID Active"
+msgstr "ID Active"
+
+#: Controller/UserCardsController.php/view_card.ctp:162
+msgid "Company Code"
+msgstr "Company Code"
+
+#: Controller/UserCardsController:305 
+msgid "Save Complete" 
+msgstr "Save Complete" 
+
+#: Controller/UserCardsController:309 
+msgid "Already registered" 
+msgstr "Already registered" 
\ No newline at end of file

www/src/Template/UserCards/view_card.ctp

@@ -573,17 +573,17 @@ use Cake\I18n\Time;
 
         function check() {
         	if ($("#organize_code").val() == '') {
-                alert(<?php echo __('Please enter Company Code') ?>);
+                alert(<?php echo __('Please enter Company Code.') ?>);
                 organize_id.focus();
                 return false;
             }
             if (employee.val() == '') {
-                alert(<?php echo __('Please enter Ref1') ?>);
+                alert(<?php echo __('Please enter Ref1.') ?>);
                 employee.focus();
                 return false;
             }
             if (date.val() == '') {
-                alert(<?php echo __('Please enter Ref2') ?>);
+                alert(<?php echo __('Please enter Ref2.') ?>);
                 date.focus();
                 return false;
             }