Commit Graph

535 Commits

Author SHA1 Message Date
Aung Myo
441bd847ec update customer 2017-06-15 14:13:40 +06:30
Aung Myo
71c3b2f451 update tether 2017-06-15 14:06:26 +06:30
Aung Myo
a77065ac3d Merge branch 'crm' 2017-06-15 14:02:44 +06:30
Aung Myo
f83d11e379 update customer 2017-06-15 14:02:09 +06:30
Aung Myo
5878999ead Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 13:19:13 +06:30
Aung Myo
ed3f97a2af upadte customer and sale void 2017-06-15 13:17:58 +06:30
Phyo
215239ec0f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 12:30:33 +06:30
Phyo
3eb1848fba Puma for production 2017-06-15 12:30:13 +06:30
Phyo
5675f0e48b Payment Bug fix 2017-06-15 12:29:36 +06:30
Nweni
4330bf9553 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 11:52:01 +06:30
Nweni
5636b7a61a Update 2017-06-15 11:51:49 +06:30
Yan
061c06b3c3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 11:25:49 +06:30
Yan
cca890ffdd disable auto reload origami 2017-06-15 11:25:13 +06:30
Yan
41572d5360 add sale reason in seed 2017-06-15 11:12:50 +06:30
Phyo
136ca65233 Back Button in Payment 2017-06-15 11:10:11 +06:30
Phyo
69320d0752 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 11:06:32 +06:30
Phyo
a600838c50 Bug Fix with Production 2017-06-15 11:05:13 +06:30
Yan
2efd6fc410 merge with origin master 2017-06-15 10:53:42 +06:30
Yan
e133595d49 authentication fixed 2017-06-15 10:48:32 +06:30
Aung Myo
7dffd668ea Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-15 10:21:26 +06:30
Aung Myo
8cb40783a4 update requestby in sail 2017-06-15 10:20:26 +06:30
Nweni
ed34088907 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 10:10:19 +06:30
Nweni
5e8bc9c013 Update 2017-06-15 10:10:02 +06:30
Phyo
2a492345a4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 09:50:43 +06:30
Phyo
c6f976bab3 Payment via card Bug fix 2017-06-15 09:49:44 +06:30
Aung Myo
29d5b134da fixed conflict 2017-06-15 09:46:01 +06:30
Aung Myo
b88c40be41 sale update 2017-06-15 09:41:00 +06:30
Nweni
8d557cf7eb remove put 2017-06-15 09:39:30 +06:30
Nweni
a1a6adbdd6 update 2017-06-15 01:49:51 +06:30
Nweni
34b1c26b0b update 2017-06-15 01:33:52 +06:30
Nweni
883653f8ee Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 01:20:09 +06:30
Nweni
401bba7aed add set up menu 2017-06-15 01:19:50 +06:30
Phyo
541907d204 Merchant Id 2017-06-14 20:08:44 +06:30
Phyo
764855bea0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 20:08:02 +06:30
Yan
5cfcc9ab6a fixed pagination 2017-06-14 20:01:34 +06:30
Yan
0eb8ac7087 fixing pagination 2017-06-14 19:54:11 +06:30
Yan
17c5a6cdf8 merge with master 2017-06-14 19:43:05 +06:30
Yan
8cfa2bc5c5 payment bill added and origami bug fixed 2017-06-14 19:41:32 +06:30
Nweni
39e03fab25 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 18:56:23 +06:30
Nweni
109d1b6435 update 2017-06-14 18:56:11 +06:30
Yan
dd9863025f prepare for payment bill 2017-06-14 18:15:01 +06:30
Aung Myo
2da2edc5ec update sale and customer 2017-06-14 18:13:13 +06:30
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
Yan
ac7d99362d Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 16:52:54 +06:30
Yan
41e9aec389 add cashier in sale and origami ui updated 2017-06-14 16:51:25 +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