Commit Graph

  • d2eaaab92c Merge pull request #1358 from odiea/master FrancescoUK 2017-06-24 16:37:17 +01:00
  • 55666caac5 Update Receiving.php odiea 2017-06-24 09:29:01 -06:00
  • 841c8166a2 Fixed missing English translation (#1355) FrancescoUK 2017-06-24 13:39:35 +01:00
  • 4e5ac5c521 Merge branch 'odiea-receivingquantity' FrancescoUK 2017-06-24 13:03:54 +01:00
  • d59e713f1f move receiving database update to common database update script FrancescoUK 2017-06-24 13:01:54 +01:00
  • 78877094fb Update receipt.php odiea 2017-06-17 07:03:43 -06:00
  • e2e0ade259 Update for Items receiving_quantity odiea 2017-06-17 06:42:48 -06:00
  • e61e409bfe Fix name Title Case issue (#1301) using a composer lib FrancescoUK 2017-06-24 12:25:40 +01:00
  • 5d22e41fe2 Fix refresh on focusout (#1351, #1328) jekkos 2017-06-20 22:39:32 +02:00
  • 0d82db42da Show string placeholders if translations are missing (#1349) jekkos 2017-06-19 22:14:01 +02:00
  • ff7848dcff Fix escape error in french (#1344) jekkos 2017-06-19 22:05:54 +02:00
  • 4866457164 Merge pull request #1342 from RuleDomain/fix-undefined-table-status FrancescoUK 2017-06-18 09:51:35 +01:00
  • acd003a44c Fix undeifined table_status error in Sale.php Steve Ireland 2017-06-13 20:43:47 -04:00
  • f407702dbe Add database.php to docker image (#1297) jekkos 2017-06-13 19:17:34 +02:00
  • d129610b24 Merge pull request #1335 from Frontuari/master FrancescoUK 2017-06-07 19:44:18 +01:00
  • 55bf5eddda Fixed Dinner Tables feature Jorge Colmenarez 2017-06-07 11:15:46 -04:00
  • 94ea15bc18 Fixed notification pop up issues in Config with tables & rewards FrancescoUK 2017-06-04 14:31:50 +01:00
  • 91fd435cca Fixes to reports tax summary and rewards regressions FrancescoUK 2017-06-04 10:46:24 +01:00
  • 8f019b4631 Merge branch 'RuleDomain-sales-tax-reporting' FrancescoUK 2017-06-03 23:09:15 +01:00
  • 51e160982e Upgrades sales tax reporting FrancescoUK 2017-06-03 23:08:09 +01:00
  • 1f2218bbc9 Upgrades sales tax reporting Steve Ireland 2017-05-14 22:32:39 -04:00
  • 77145d29a8 Regnerate language files (#1330) jekkos 2017-06-02 19:46:54 +02:00
  • 3a447561eb Merge pull request #1330 from rotrico/master jekkos 2017-06-02 19:43:21 +02:00
  • 6ee545d6eb Improve spanish translation to master version rotrico 2017-06-01 13:56:48 +02:00
  • afbf714bd2 Revert "Translated using Weblate (English)" mistakes FrancescoUK 2017-05-30 21:04:22 +01:00
  • 1a2bc1cc42 Merge pull request #1327 from joshua1234511/hotfix/giftcard-stuck-at-10-issue FrancescoUK 2017-05-30 07:07:05 +01:00
  • 4268a70388 fix for that issue both display and count Joshua Fernandes 2017-05-30 07:36:57 +05:30
  • 189b189e08 Translated using Weblate (Indonesian) Almubaraq Ratomi 2017-05-28 22:04:29 +00:00
  • 403c875edf Translated using Weblate (Indonesian) Almubaraq Ratomi 2017-05-28 23:06:39 +00:00
  • 4f6cf8b917 Translated using Weblate (Indonesian) Almubaraq Ratomi 2017-05-28 23:06:39 +00:00
  • fd6335081d Translated using Weblate (English) Almubaraq Ratomi 2017-05-25 22:00:04 +00:00
  • 234cedff15 Translated using Weblate (Indonesian) Almubaraq Ratomi 2017-05-28 22:50:19 +00:00
  • 8348628dc6 Translated using Weblate (English) Almubaraq Ratomi 2017-05-25 22:00:08 +00:00
  • ade9a57fe0 Translated using Weblate (Indonesian) Almubaraq Ratomi 2017-05-28 22:44:42 +00:00
  • 6559f9c561 Translated using Weblate (Indonesian) Almubaraq Ratomi 2017-05-28 22:03:16 +00:00
  • a7a559fc72 Translated using Weblate (Indonesian) Almubaraq Ratomi 2017-05-28 22:04:49 +00:00
  • e25d1483ae Translated using Weblate (Portuguese (Brazil)) Marcos 2017-05-28 07:37:57 +00:00
  • 41a5218583 Translated using Weblate (Indonesian) Almubaraq Ratomi 2017-05-26 05:23:04 +00:00
  • cc7fcaf264 Translated using Weblate (Indonesian) Almubaraq Ratomi 2017-05-25 22:33:08 +00:00
  • e776f31ec5 Translated using Weblate (Indonesian) Almubaraq Ratomi 2017-05-25 22:11:58 +00:00
  • d60e1283bd Fix double submit issue (#1309) jekkos 2017-05-30 00:06:04 +02:00
  • b2d80acafc Regenerate db files FrancescoUK 2017-05-28 09:06:04 +01:00
  • 37097babcf Fix double submit after focusing OK button (#1309) jekkos 2017-05-24 09:21:58 +02:00
  • 15bb3ad6a3 Reset stock inventory when deleting items (#1288) jekkos 2017-05-22 19:30:06 +02:00
  • 5c0c74b037 Translated using Weblate (Indonesian) Adrian Wahyudi 2017-05-02 18:05:55 +00:00
  • 7093874366 Translated using Weblate (Indonesian) Adrian Wahyudi 2017-05-02 18:05:54 +00:00
  • 34ae6486dc Translated using Weblate (Indonesian) Adrian Wahyudi 2017-05-02 18:00:06 +00:00
  • 2d3d385cbc Add migration support and upgrade db to new tax tables (#1133) FrancescoUK 2017-05-14 18:40:46 +01:00
  • c0a9349b60 Add support for database migration Steve Ireland 2017-05-06 11:31:33 -04:00
  • c4a76ad01c Fixed Takings filters bug (#1286) FrancescoUK 2017-05-01 13:12:25 +01:00
  • 8d1bc4cf17 Removed npm package dependencies section FrancescoUK 2017-05-01 12:28:09 +01:00
  • daa1614615 Revert "Merge pull request #1281 from RuleDomain/migrate-sales-tax-history" FrancescoUK 2017-05-01 11:50:13 +01:00
  • 34afb9d496 Merge pull request #1283 from RuleDomain/remove-debug-code FrancescoUK 2017-05-01 08:08:00 +01:00
  • 27d5fd882b Remove debug code Steve Ireland 2017-04-30 23:31:31 -04:00
  • d25c6dc8c1 Added ApiGen documentation to model/person class as an example FrancescoUK 2017-04-30 23:27:03 +01:00
  • 11e1cc51aa Merge pull request #1281 from RuleDomain/migrate-sales-tax-history FrancescoUK 2017-04-30 23:14:41 +01:00
  • b32c23ce10 Merge pull request #1282 from Frontuari/fix-change-password-issue FrancescoUK 2017-04-30 19:25:03 +01:00
  • 00a792213c Fix issue for change password support Jorge Colmenarez 2017-04-30 13:16:12 -04:00
  • c710ec938f Sales tax history migration Steve Ireland 2017-04-30 11:24:58 -04:00
  • d0ada1e42f Created bin/gendocs.sh script to invoke ApiGen removing all vendor/ dependencies (#1278) FrancescoUK 2017-04-30 13:53:49 +01:00
  • e89fc6afb2 Move Gruntfile.js composer task and apigen task to separate tasks (#1278) FrancescoUK 2017-04-30 13:40:22 +01:00
  • f9fb9e44b3 Added apigen to generate OSPOS code documentation (see docs) FrancescoUK 2017-04-29 23:43:15 +01:00
  • 4c2d63bbd3 Added Total Spent to Customer tabular view FrancescoUK 2017-04-29 19:55:03 +01:00
  • ac92c16c0a Always reformat first and last name, and lower case emails FrancescoUK 2017-04-29 15:55:03 +01:00
  • edd1f047bd Merge branch 'joshua1234511-feature/auto-complete-giftcard' FrancescoUK 2017-04-27 19:49:49 +01:00
  • c8ac6a65dc Fixed css and indentation FrancescoUK 2017-04-27 19:49:11 +01:00
  • 6acfc60988 auto suggest gift card Joshua Fernandes 2017-04-27 12:41:27 +05:30
  • 6682b77164 Merge branch 'joshua1234511-hotfix/giftcard-customer-restrict-fix' FrancescoUK 2017-04-26 20:06:39 +01:00
  • eb4f3b425b fixes for giftcard FrancescoUK 2017-04-26 20:06:08 +01:00
  • 93b0844121 fixes for giftcard Joshua Fernandes 2017-04-24 10:45:12 +05:30
  • 40d32e1b8a Use consistent name for forms (#227) FrancescoUK 2017-04-24 20:30:56 +01:00
  • af1aee0015 Fix change password bugs (#227) FrancescoUK 2017-04-24 20:26:48 +01:00
  • 1e64b3e610 Merge pull request #1257 from Frontuari/changepassword FrancescoUK 2017-04-24 19:21:55 +01:00
  • 8f728500d4 Verify current password before change password Jorge Colmenarez 2017-04-24 13:51:25 -04:00
  • c68fa19584 Made print company name in receipts optional (#925) FrancescoUK 2017-04-22 17:09:22 +01:00
  • 5bdf6d396b Add Mailchimp connector (#113) avoid email duplicates (#112) FrancescoUK 2017-04-22 13:42:34 +01:00
  • 0114223e99 Giftcard random number/alpha numeric FrancescoUK 2017-04-22 13:34:43 +01:00
  • b819442e98 Fix indentation and regen db scripts FrancescoUK 2017-04-22 13:33:27 +01:00
  • 15681edf43 fixed query Joshua Fernandes 2017-04-22 17:29:56 +05:30
  • 0cd19ca43f uncommenr var dumb Joshua Fernandes 2017-04-22 16:56:53 +05:30
  • 621a74653d requested changes Joshua Fernandes 2017-04-22 16:54:47 +05:30
  • 6dc49ca00e sales fixes Joshua Fernandes 2017-04-22 12:20:32 +05:30
  • 7a91388d8d giftcard random number Joshua Fernandes 2017-04-22 11:12:39 +05:30
  • 1680f2b602 Fix wrong code issue (#1247) FrancescoUK 2017-04-22 10:28:05 +01:00
  • 80c58cf27d Add search custom items string (#1256) FrancescoUK 2017-04-22 10:01:27 +01:00
  • dd21f205b7 Fix wrong code issue (#1247) FrancescoUK 2017-04-22 09:30:53 +01:00
  • 8261cc1f72 Support for change password Jorge Colmenarez 2017-04-21 16:13:25 -04:00
  • 08a7bd9606 Fix review comment (#1253) FrancescoUK 2017-04-21 19:02:11 +01:00
  • 56ae0f265a Merge pull request #1253 from RuleDomain/fix-customer-change-issue FrancescoUK 2017-04-21 06:43:44 +01:00
  • c95c56ade7 Fix the customer change issue. Steve Ireland 2017-04-20 23:34:56 -04:00
  • b057d1c3c0 Overload existing env vars with .env contents (#974) Add error handling if .env is not present jekkos 2017-04-20 00:10:26 +02:00
  • 248cd29e01 change database variable names in example file Deep Shah 2016-11-28 13:09:00 +05:30
  • bacc07ce35 revert change on db_log_enabled Deep Shah 2016-11-18 00:40:41 +05:30
  • aef542d096 dotenv used for configurations Deep Shah 2016-11-17 22:34:23 +05:30
  • 28141185a4 change database settings as per Dockerfile, remove the correspoding scripts from Dockerfile Deep Shah 2016-11-23 16:10:44 +05:30
  • deb235a971 change ['<key>'] to getenv('<key>') Deep Shah 2016-11-23 15:59:47 +05:30
  • 878d93aee9 revert change on db_log_enabled Deep Shah 2016-11-18 00:40:41 +05:30
  • 9db7eddc68 dotenv used for configurations Deep Shah 2016-11-17 22:34:23 +05:30
  • e2232ba9cc Translated using Weblate (Spanish) Jorge Colmenarez 2017-04-17 16:08:17 +00:00
  • 4db76371fd Regenerate langauge files (#1242) jekkos 2017-04-18 19:12:08 +02:00