Commit Graph

480 Commits

Author SHA1 Message Date
Phyo
d970cfc8bd Other Payments UI change 2017-06-14 17:58:38 +06:30
Phyo
91de9f2767 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 17:14:03 +06:30
Phyo
3b99016f80 Limit paid amount for JCB, Visa and Master Card 2017-06-14 17:13:43 +06:30
Nweni
15c19e0cbb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 16:06:24 +06:30
Nweni
f00bd9df37 update 2017-06-14 16:06:11 +06:30
Aung Myo
391b57ccd5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 15:59:52 +06:30
Aung Myo
1963acbec0 Merge branch 'crm' 2017-06-14 15:59:19 +06:30
Aung Myo
914069e3af update customer and sale 2017-06-14 15:58:41 +06:30
Phyo
af623cb474 Instances Name Show 2017-06-14 15:01:36 +06:30
Phyo
2d0d962677 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 13:58:09 +06:30
Nweni
f7451a4675 update 2017-06-14 13:33:09 +06:30
Phyo
5cff9c891b Other Payment shown by type 2017-06-14 12:02:52 +06:30
Nweni
7b2d2731c1 auth 2017-06-14 11:05:15 +06:30
Nweni
d7fca79881 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:49:19 +06:30
Nweni
9d1aff2fa2 other payment updated 2017-06-14 10:49:00 +06:30
Aung Myo
14e0d91a4e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:45:36 +06:30
Phyo
4126012e6d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:44:00 +06:30
Aung Myo
c155c86970 update checkbox in customer view 2017-06-14 10:43:27 +06:30
Phyo
f0fe589ec6 Payment conflict in Del key 2017-06-14 10:43:19 +06:30
Nweni
3d2b9f745e payment 2017-06-14 10:41:26 +06:30
Nweni
998b23aae5 update key 2017-06-14 10:27:15 +06:30
Aung Myo
3cb5878293 update sale 2017-06-14 10:18:48 +06:30
Nweni
a16af5e404 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:07:48 +06:30
Nweni
7d5d23e5a6 Update 2017-06-14 10:07:31 +06:30
Aung Myo
871c37f04e update search 2017-06-14 00:11:03 +06:30
Aung Myo
3db6252304 update search and crm 2017-06-14 00:09:54 +06:30
Aung Myo
713e0a367c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-13 20:23:00 +06:30
Aung Myo
e9d3ca3059 pull master for membership 2017-06-13 20:22:33 +06:30
Moe Su
27971f406b Seed 2017-06-13 20:22:28 +06:30
Aung Myo
7057e320cf Merge branch 'crm' 2017-06-13 20:13:01 +06:30
Aung Myo
b86ae8d32d customer search 2017-06-13 20:11:24 +06:30
Nweni
2e316f46fe seed updated 2017-06-13 19:58:15 +06:30
Nweni
d1d8226528 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 19:49:35 +06:30
Nweni
71f88f8a5d Update 2017-06-13 19:49:25 +06:30
Phyo
57f7f1037d Change Amount Bug Fix 2017-06-13 19:41:51 +06:30
Nweni
db2cce3dfa Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 19:06:59 +06:30
Nweni
0e86b12ecd order controller update 2017-06-13 19:06:50 +06:30
Moe Su
b69d2525fe add auth_token 2017-06-13 19:02:06 +06:30
Moe Su
3db3b8c7e7 add auth_token 2017-06-13 19:01:14 +06:30
Nweni
9ae4c13f87 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 18:55:31 +06:30
Nweni
c6ee0e9d25 update seed 2017-06-13 18:55:20 +06:30
Aung Myo
77a41eb9dc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 18:47:56 +06:30
Aung Myo
8a6c0bf059 update rebate amount in payment 2017-06-13 18:46:43 +06:30
Nweni
39e9c5419a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 18:37:24 +06:30
Nweni
0d5767b022 Update 2017-06-13 18:37:14 +06:30
Aung Myo
a600c233d5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-13 18:28:40 +06:30
Aung Myo
7f7d579d2f add auth token:
exit
2017-06-13 18:28:22 +06:30
Moe Su
974ed6a908 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 17:42:05 +06:30
Moe Su
19160a9630 Change redeem name 2017-06-13 17:41:50 +06:30
Phyo
8a7c1f0d88 Payment Vs Tax 2017-06-13 16:05:20 +06:30