Commit Graph

  • 36177d1431 Fix jQuery get and make it future proof jekkos 2017-08-03 19:45:46 +02:00
  • bc04884190 Add function to parse barcode fields jekkos 2017-07-30 17:53:27 +02:00
  • 8a3ba5692a Minor fixes (#1443) FrancescoUK 2017-08-05 15:10:04 +01:00
  • e89bd73bb5 Add reCaptcha to login page (#1443) FrancescoUK 2017-08-05 11:46:48 +01:00
  • f1936dbb4d Fixed rewards foreign key constraint issue (#1436) FrancescoUK 2017-08-03 21:39:40 +01:00
  • 629f180b8d Dispay tax decimals or currency decimals for tax amounts depending on if sales tax is enabled. Steve Ireland 2017-07-29 22:54:49 -04:00
  • 6485cf050d Add database foreign keys related to rewards FrancescoUK 2017-07-29 22:21:20 +01:00
  • cd792eb56a Add receipt font size configuration (#1401 #1416) FrancescoUK 2017-07-28 21:48:34 +01:00
  • 256c926e3d Fix French translation mistakes causing errors (#1418) FrancescoUK 2017-07-28 20:50:32 +01:00
  • c18c703237 Fix double counting of payments in summary report (#1415) FrancescoUK 2017-07-28 20:39:19 +01:00
  • 6e64f8ef00 Add customer phone number if available in the register suggestions (#744) FrancescoUK 2017-07-28 20:22:00 +01:00
  • 591d432d4f Lookup customer in sales register by phone number and email (#1087) FrancescoUK 2017-07-28 20:08:00 +01:00
  • 4a61119c3d Regen ApiGen code documentation FrancescoUK 2017-07-28 18:15:35 +01:00
  • d7237261f7 Update js plugins FrancescoUK 2017-07-28 18:11:28 +01:00
  • 81512aa76e Update bower.json FrancescoUK 2017-07-28 16:57:26 +01:00
  • 0dec6819ad Fix git exclusion (#1408) FrancescoUK 2017-07-27 20:03:09 +01:00
  • afca2882f8 Regen dist and database files FrancescoUK 2017-07-27 19:47:14 +01:00
  • eb610fccb5 Add missing bootswatch themes (#1408) jekkos 2017-07-25 20:41:09 +02:00
  • 641e2f414c Add missing language element for rounding code "Unknown" and eliminate duplicate statements in upgrade statement, and fix issue with 0 tax_category_id Steve Ireland 2017-07-15 19:05:15 -04:00
  • 5d49728c74 Don't add csrf token if cookie expired (#1392) jekkos 2017-07-18 08:51:01 +02:00
  • 858845f4f5 Merge pull request #1397 from RuleDomain/tax-category-cleanup FrancescoUK 2017-07-15 22:08:09 +01:00
  • eccf08cf8f Improve tax category maintenance. Steve Ireland 2017-07-15 16:42:27 -04:00
  • 623572b0f5 Update js plugin and regen dist files FrancescoUK 2017-07-14 16:29:47 +01:00
  • dc0d580d05 Fix exceptions in invoice and receipt emails (#1325) FrancescoUK 2017-07-14 11:28:08 +01:00
  • fe05845bd4 Fix invoice code indentation FrancescoUK 2017-07-14 09:56:53 +01:00
  • 1798b4553b Update weblate translations Weblate 2017-07-14 06:40:14 +00:00
  • e59a3372a9 Translated using Weblate (Arabic) AELHOFY 2017-06-27 16:41:11 +00:00
  • 8a7b93f1b9 Sync language files (#1242) jekkos 2017-07-14 08:34:30 +02:00
  • 61a3fee4a6 Fix sales / token substitution jekkos 2017-07-14 08:30:35 +02:00
  • a92d60d99f Minor refactoring tax story jekkos 2017-07-05 00:19:27 +02:00
  • 47486b980f Fix Store Config Tax category, Reward, Locations and Tables add and remove of entries FrancescoUK 2017-07-13 22:43:05 +01:00
  • dc14cbd7ab Merge pull request #1395 from RuleDomain/fix-quotes-in-takings-2 FrancescoUK 2017-07-13 18:54:57 +01:00
  • d7b7f5510c Remove redundant where clause in Sales.php Steve Ireland 2017-07-13 13:15:54 -04:00
  • 323b7900e9 Merge pull request #1393 from RuleDomain/fix-quotes-in-takings FrancescoUK 2017-07-13 15:02:17 +01:00
  • eb4d0c8c88 Remove quotes from the list of takings. Steve Ireland 2017-07-12 23:15:34 -04:00
  • b0e3600ea6 Fix stock location update (#1389) FrancescoUK 2017-07-12 22:22:05 +01:00
  • 41ae935223 Merge branch 'RuleDomain-long-alt-description' FrancescoUK 2017-07-11 22:53:37 +01:00
  • 60db2cc4b0 Fixes FrancescoUK 2017-07-11 22:43:08 +01:00
  • b7951ea5b2 Consolidate tax configuration. Steve Ireland 2017-07-09 11:30:02 -04:00
  • cb31ebb06e Extend alternate item description to 255 characters. Steve Ireland 2017-07-09 15:18:30 -04:00
  • 3f0a53933c Merge branch 'RuleDomain-tax-configuration' FrancescoUK 2017-07-11 22:23:42 +01:00
  • f92b06cff2 Fixes FrancescoUK 2017-07-11 22:23:14 +01:00
  • bab4791b5e Consolidate tax configuration. Steve Ireland 2017-07-09 11:30:02 -04:00
  • 421468f6d8 Update README.md FrancescoUK 2017-07-07 21:25:55 +01:00
  • f3a08eab3b Update ISSUE_TEMPLATE.md FrancescoUK 2017-07-07 21:23:10 +01:00
  • 863988d2ab Regen ApiGen documentation FrancescoUK 2017-07-06 22:13:18 +01:00
  • e524593a15 Minor fixes FrancescoUK 2017-07-06 20:38:41 +01:00
  • 181d904360 Visualise the taxes according to the selected number of decimals (#1133) FrancescoUK 2017-07-06 20:31:10 +01:00
  • 4448348f7c Improve sale status reporting Steve Ireland 2017-07-04 11:19:54 -04:00
  • bb762efac7 Merge pull request #1376 from odiea/master FrancescoUK 2017-07-04 08:55:48 +01:00
  • c5697edf76 Fix payment summary report missing return and location (#1133) FrancescoUK 2017-07-03 22:07:58 +01:00
  • 3f73e449f0 Fix summary report and detailed sale report different tax issue (#1133) FrancescoUK 2017-07-03 20:13:37 +01:00
  • a18745b3af Update Items.php odiea 2017-07-03 06:23:05 -06:00
  • 0057c77721 Replace UPC/EAN/ISBN with Barcode label (#1370) FrancescoUK 2017-07-02 21:52:07 +01:00
  • fd3fecbd76 Update README FrancescoUK 2017-07-02 21:31:56 +01:00
  • ad690c9ca6 Add odiea to the hall of fame :-) FrancescoUK 2017-07-02 21:27:09 +01:00
  • ab29527619 Fix (yet again) registry "complete" issue with rounding FrancescoUK 2017-07-02 21:07:55 +01:00
  • 12b5ed43c6 Regen ApiGen documentation FrancescoUK 2017-07-02 20:26:45 +01:00
  • a78f053c80 Fix config Table and Reward errors FrancescoUK 2017-07-02 19:48:58 +01:00
  • 5ea0324bc0 Fix rounding issues in reports (#1336) FrancescoUK 2017-07-02 15:32:06 +01:00
  • 005193e3e0 Update CodeIgniter to vs 3.1.5 FrancescoUK 2017-07-02 13:05:12 +01:00
  • 95733ea476 Regen Apigen documentation FrancescoUK 2017-07-02 11:23:09 +01:00
  • c8499599ab General code tidy up, added documentation FrancescoUK 2017-07-02 11:15:50 +01:00
  • 2f44a9d5c2 Update ISSUE_TEMPLATE.md FrancescoUK 2017-07-02 09:00:34 +01:00
  • d28e95208b Update TEMPLATE_ISSUES.md to reflect the latest FrancescoUK 2017-07-01 10:06:05 +01:00
  • c4bda0e1fe Merge branch 'RuleDomain-vat-discount-amount-issues' FrancescoUK 2017-06-30 19:11:41 +01:00
  • 15e0da4515 Minor fixes FrancescoUK 2017-06-30 19:10:43 +01:00
  • c71ce1e8ae Fix discount issue on checkout in VAT tax scenario Steve Ireland 2017-06-26 23:22:25 -04:00
  • d5e2b6cb0d Regen files FrancescoUK 2017-06-30 19:03:15 +01:00
  • d25b1408c9 Merge pull request #1362 from RuleDomain/discard-quote-fix FrancescoUK 2017-06-27 06:22:09 +01:00
  • c3f83202a8 Fix failure to discard quotes Steve Ireland 2017-06-26 23:32:35 -04:00
  • 643c5d91a6 Merge pull request #1360 from RuleDomain/suspended-sale-inventory-fix FrancescoUK 2017-06-26 05:55:38 +01:00
  • 69e56d06ae Correction to update inventory only if item type is standard and sale type is standard. Steve Ireland 2017-06-25 22:11:06 -04:00
  • ee2f66aa61 Merge pull request #1359 from odiea/master FrancescoUK 2017-06-25 20:35:31 +01:00
  • 16502065fa Fix Detailed Reports to show table content. odiea 2017-06-25 09:53:57 -06:00
  • 1a7ed8a69b Fix line duplication mistake (#1358) FrancescoUK 2017-06-24 17:44:58 +01:00
  • 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