Commit Graph

248 Commits

Author SHA1 Message Date
Yan
0778df4e80 order fix for booking 2017-06-15 14:44:27 +06:30
Yan
bd94e808d4 print format 2017-06-15 13:24:37 +06:30
Yan
41572d5360 add sale reason in seed 2017-06-15 11:12:50 +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
8cb40783a4 update requestby in sail 2017-06-15 10:20:26 +06:30
Nweni
8d557cf7eb remove put 2017-06-15 09:39:30 +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
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
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
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
Yan
c1e8f3ffb2 updated printer for each stations 2017-06-14 15:30:28 +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
3d2b9f745e payment 2017-06-14 10:41:26 +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
e9d3ca3059 pull master for membership 2017-06-13 20:22:33 +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
71f88f8a5d Update 2017-06-13 19:49:25 +06:30
Nweni
0e86b12ecd order controller update 2017-06-13 19:06:50 +06:30
Aung Myo
8a6c0bf059 update rebate amount in payment 2017-06-13 18:46:43 +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
Phyo
8a7c1f0d88 Payment Vs Tax 2017-06-13 16:05:20 +06:30
Aung Myo
7194f0e971 update sale search 2017-06-13 15:04:51 +06:30
Aung Myo
03b839fc07 update customer detail 2017-06-13 14:12:35 +06:30
Aung Myo
4f7fda6902 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 12:05:11 +06:30
Aung Myo
ee54f1cdd3 validate error 2017-06-13 12:04:55 +06:30
Phyo
99d00f6d2a Redeem amount validation 2017-06-13 12:04:31 +06:30
Aung Myo
6717becf92 Customer Update 2017-06-13 11:35:30 +06:30
Aung Myo
f8df5147a4 fixed conflict file 2017-06-13 10:40:49 +06:30
Aung Myo
c05a64bae7 update customer amount 2017-06-13 10:36:40 +06:30
Yan
3404c5e0bd ui updating for report 2017-06-13 09:59:56 +06:30
Yan
8fc4fa5cf1 order quries update 2017-06-12 20:14:20 +06:30
Yan
1d1a913732 bug fix for order completed 2017-06-12 20:11:37 +06:30
Nweni
c904451110 update 2017-06-12 19:35:05 +06:30