Commit Graph

2187 Commits

Author SHA1 Message Date
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
jekkos
b057d1c3c0 Overload existing env vars with .env contents (#974)
Add error handling if .env is not present
2017-04-20 08:27:04 +02:00
Deep Shah
248cd29e01 change database variable names in example file 2017-04-20 08:27:04 +02:00
Deep Shah
bacc07ce35 revert change on db_log_enabled 2017-04-20 08:27:04 +02:00
Deep Shah
aef542d096 dotenv used for configurations 2017-04-20 08:27:04 +02:00
Deep Shah
28141185a4 change database settings as per Dockerfile, remove the correspoding scripts from Dockerfile 2017-04-20 08:27:04 +02:00
Deep Shah
deb235a971 change ['<key>'] to getenv('<key>') 2017-04-20 08:27:04 +02:00
Deep Shah
878d93aee9 revert change on db_log_enabled 2017-04-20 08:27:04 +02:00
Deep Shah
9db7eddc68 dotenv used for configurations 2017-04-20 08:27:04 +02:00
Jorge Colmenarez
e2232ba9cc Translated using Weblate (Spanish)
Currently translated at 100.0% (201 of 201 strings)
2017-04-18 17:14:30 +00:00
jekkos
4db76371fd Regenerate langauge files (#1242) 2017-04-18 19:12:41 +02:00
FrancescoUK
9d01398a4b Minor code style adjustments 2017-04-17 21:47:22 +01:00
FrancescoUK
66a4507525 Added more financial year start dates (#1141) 2017-04-17 20:31:10 +01:00
FrancescoUK
938907fe20 Added financial year start date (#1141), various fixes on date & time 2017-04-17 20:20:53 +01:00
FrancescoUK
1738f76402 Regen dist files (#1234) 2017-04-17 12:31:14 +01:00
jekkos
b7251dd693 Fix button enabled state after search and page change (#1234) 2017-04-17 13:17:00 +02:00
jekkos
8f7a425333 Set folder owner for application to www-data in docker (#1189) 2017-04-17 13:17:00 +02:00
FrancescoUK
7e7c068c90 Add only_check filter to takings (#1244) 2017-04-17 12:00:56 +01:00
FrancescoUK
73ae7b8fd2 Minor fixes to database scripts 2017-04-17 12:00:56 +01:00
Aril Apria Susanto
56b228c698 Translated using Weblate (Indonesian)
Currently translated at 99.2% (132 of 133 strings)
2017-04-16 21:31:22 +00:00
Aril Apria Susanto
b5a44a8308 Translated using Weblate (Indonesian)
Currently translated at 97.6% (84 of 86 strings)
2017-04-16 21:31:22 +00:00