Commit Graph

2207 Commits

Author SHA1 Message Date
jekkos
d60e1283bd Fix double submit issue (#1309) 2017-05-30 00:14:33 +02:00
FrancescoUK
b2d80acafc Regenerate db files 2017-05-28 09:06:04 +01:00
jekkos
37097babcf Fix double submit after focusing OK button (#1309) 2017-05-24 09:21:58 +02:00
jekkos
15bb3ad6a3 Reset stock inventory when deleting items (#1288) 2017-05-22 19:33:13 +02:00
Adrian Wahyudi
5c0c74b037 Translated using Weblate (Indonesian)
Currently translated at 98.9% (94 of 95 strings)
2017-05-16 14:13:37 +00:00
Adrian Wahyudi
7093874366 Translated using Weblate (Indonesian)
Currently translated at 100.0% (214 of 214 strings)
2017-05-16 14:13:37 +00:00
Adrian Wahyudi
34ae6486dc Translated using Weblate (Indonesian)
Currently translated at 100.0% (214 of 214 strings)
2017-05-16 14:13:36 +00:00
FrancescoUK
2d3d385cbc Add migration support and upgrade db to new tax tables (#1133) 2017-05-14 18:40:46 +01:00
Steve Ireland
c0a9349b60 Add support for database migration 2017-05-09 20:45:25 -04:00
FrancescoUK
c4a76ad01c Fixed Takings filters bug (#1286) 2017-05-01 13:12:25 +01:00
FrancescoUK
8d1bc4cf17 Removed npm package dependencies section 2017-05-01 12:28:09 +01:00
FrancescoUK
daa1614615 Revert "Merge pull request #1281 from RuleDomain/migrate-sales-tax-history"
This reverts commit 11e1cc51aa, reversing
changes made to b32c23ce10.

# Conflicts:
#	application/models/Sale.php
2017-05-01 11:50:13 +01:00
FrancescoUK
34afb9d496 Merge pull request #1283 from RuleDomain/remove-debug-code
Remove debug code
2017-05-01 08:08:00 +01:00
Steve Ireland
27d5fd882b Remove debug code 2017-04-30 23:31:31 -04:00
FrancescoUK
d25c6dc8c1 Added ApiGen documentation to model/person class as an example 2017-04-30 23:27:15 +01:00
FrancescoUK
11e1cc51aa Merge pull request #1281 from RuleDomain/migrate-sales-tax-history
Sales tax history migration (#1163)
2017-04-30 23:14:41 +01:00
FrancescoUK
b32c23ce10 Merge pull request #1282 from Frontuari/fix-change-password-issue
Fix issue for change password support (#227)
2017-04-30 19:25:03 +01:00
Jorge Colmenarez
00a792213c Fix issue for change password support 2017-04-30 13:16:12 -04:00
Steve Ireland
c710ec938f Sales tax history migration 2017-04-30 11:30:39 -04:00
FrancescoUK
d0ada1e42f Created bin/gendocs.sh script to invoke ApiGen removing all vendor/ dependencies (#1278) 2017-04-30 13:53:49 +01:00
FrancescoUK
e89fc6afb2 Move Gruntfile.js composer task and apigen task to separate tasks (#1278) 2017-04-30 13:40:22 +01:00
FrancescoUK
f9fb9e44b3 Added apigen to generate OSPOS code documentation (see docs)
Added grunt-composer and grunt-apigen and scripted all the steps in Grunt
2017-04-29 23:43:15 +01:00
FrancescoUK
4c2d63bbd3 Added Total Spent to Customer tabular view 2017-04-29 19:55:03 +01:00
FrancescoUK
ac92c16c0a Always reformat first and last name, and lower case emails 2017-04-29 15:55:03 +01:00
FrancescoUK
edd1f047bd Merge branch 'joshua1234511-feature/auto-complete-giftcard'
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-04-27 19:49:49 +01:00
FrancescoUK
c8ac6a65dc Fixed css and indentation 2017-04-27 19:49:11 +01:00
Joshua Fernandes
6acfc60988 auto suggest gift card 2017-04-27 12:41:27 +05:30
FrancescoUK
6682b77164 Merge branch 'joshua1234511-hotfix/giftcard-customer-restrict-fix'
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-04-26 20:06:39 +01:00
FrancescoUK
eb4f3b425b fixes for giftcard 2017-04-26 20:06:08 +01:00
Joshua Fernandes
93b0844121 fixes for giftcard 2017-04-26 20:03:59 +01:00
FrancescoUK
40d32e1b8a Use consistent name for forms (#227) 2017-04-24 20:30:56 +01:00
FrancescoUK
af1aee0015 Fix change password bugs (#227) 2017-04-24 20:26:48 +01:00
FrancescoUK
1e64b3e610 Merge pull request #1257 from Frontuari/changepassword
Support for change user password (#227)
2017-04-24 19:21:54 +01:00
Jorge Colmenarez
8f728500d4 Verify current password before change password 2017-04-24 13:51:25 -04:00
FrancescoUK
c68fa19584 Made print company name in receipts optional (#925) 2017-04-22 17:09:22 +01:00
FrancescoUK
5bdf6d396b Add Mailchimp connector (#113) avoid email duplicates (#112) 2017-04-22 16:07:33 +01:00
FrancescoUK
0114223e99 Giftcard random number/alpha numeric 2017-04-22 13:38:56 +01:00
FrancescoUK
b819442e98 Fix indentation and regen db scripts 2017-04-22 13:33:45 +01:00
Joshua Fernandes
15681edf43 fixed query 2017-04-22 13:33:45 +01:00
Joshua Fernandes
0cd19ca43f uncommenr var dumb 2017-04-22 13:33:45 +01:00
Joshua Fernandes
621a74653d requested changes 2017-04-22 13:33:45 +01:00
Joshua Fernandes
6dc49ca00e sales fixes 2017-04-22 13:33:45 +01:00
Joshua Fernandes
7a91388d8d giftcard random number 2017-04-22 13:33:45 +01:00
FrancescoUK
1680f2b602 Fix wrong code issue (#1247) 2017-04-22 10:28:05 +01:00
FrancescoUK
80c58cf27d Add search custom items string (#1256) 2017-04-22 10:01:27 +01:00
FrancescoUK
dd21f205b7 Fix wrong code issue (#1247) 2017-04-22 09:30:53 +01:00
Jorge Colmenarez
8261cc1f72 Support for change password 2017-04-21 16:13:25 -04:00
FrancescoUK
08a7bd9606 Fix review comment (#1253) 2017-04-21 19:02:11 +01:00
FrancescoUK
56ae0f265a Merge pull request #1253 from RuleDomain/fix-customer-change-issue
Fix the customer change issue (#1250)
2017-04-21 06:43:44 +01:00
Steve Ireland
c95c56ade7 Fix the customer change issue. 2017-04-20 23:34:56 -04:00