Commit Graph

4095 Commits

Author SHA1 Message Date
Myat Zin Wai Maw
a5dfa6796c fix conflict 2019-08-05 11:41:44 +06:30
Myat Zin Wai Maw
3f08f99bf4 option select addorder 2019-08-05 11:23:25 +06:30
Myat Zin Wai Maw
422f5109bd promotion 2019-07-30 17:59:53 +06:30
Myat Zin Wai Maw
0d735ac26b fix promotion 2019-07-30 14:13:14 +06:30
Myat Zin Wai Maw
cdc9675511 comment in shop.rb 2019-07-26 13:58:41 +06:30
Myat Zin Wai Maw
3d110774ba promotion issue second item 2019-07-25 14:29:46 +06:30
Myat Zin Wai Maw
4a640263e4 promotion 2019-07-22 16:01:03 +06:30
Zoey
1a11b9e2e7 kbzpay 2019-07-22 15:57:33 +06:30
Myat Zin Wai Maw
d566c1edb0 fix 2019-07-22 14:35:10 +06:30
Myat Zin Wai Maw
29c83cfa18 fix error in promotion 2019-07-22 14:28:11 +06:30
Zoey
931df461b5 kbzpay 2019-07-22 13:59:06 +06:30
Myat Zin Wai Maw
fc0612b2f5 Promotion Setting Issue 2019-07-22 09:56:39 +06:30
Myat Zin Wai Maw
a378caed08 promotion by order_id 2019-07-18 15:22:13 +06:30
Zoey
22c5d14edf before pull 2019-07-11 10:06:28 +06:30
Zoey
57d2da094d prefix 2019-07-04 10:04:17 +06:30
Zoey
4cfd6c4103 prefix 2019-07-04 09:51:13 +06:30
Zoey
569f074a4e all items foc case fixed 2019-07-03 14:15:09 +06:30
Zoey
6247e6c37d kbz pay method 2019-07-03 14:01:17 +06:30
Zoey
7e5d90770c fix conflicts 2019-07-03 13:51:41 +06:30
Zoey
b7368314c5 print receipt bill 2019-07-03 13:49:54 +06:30
NyanLinHtut
cdcd4ff59c fixed conflit 2019-07-01 11:17:29 +06:30
NyanLinHtut
aca0c390c9 insert looktype for receipt bill 2019-07-01 11:11:44 +06:30
Myat Zin Wai Maw
f186ddeed9 git merge 2019-06-28 14:41:59 +06:30
Myat Zin Wai Maw
0872ce5051 fix conflict 2019-06-28 14:36:21 +06:30
Zoey
8a6b8dfa59 foc receipt bill 2019-06-27 17:25:23 +06:30
NyanLinHtut
66445ed318 fixed conflit 2019-06-27 14:05:52 +06:30
NyanLinHtut
49917c352c add show subtotal+service charges in receipt bill 2019-06-27 13:51:02 +06:30
Zoey
29ef6c17f9 before pull 2019-06-27 10:52:25 +06:30
Zoey
74b758e163 KBZPay Receipt Pdf modified 2019-06-27 10:43:30 +06:30
Zoey
52a375f2a4 kbzpay payment updated 2019-06-26 13:35:27 +06:30
Zoey
2e306a6339 kbz pay fixed 2019-06-26 12:18:17 +06:30
Zoey
b948f10209 kbzpay 2019-06-26 12:05:37 +06:30
Zoey
8cfb88ca73 Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev 2019-06-26 11:43:11 +06:30
Zoey
79d8eb94ef kbzpay 2019-06-26 11:42:51 +06:30
Myat Zin Wai Maw
5304270246 fix conflict 2019-06-25 10:30:08 +06:30
Myat Zin Wai Maw
438cefcc49 Inventory report 2019-06-25 10:27:31 +06:30
Zoey
88c5dc2144 kbzpay setting 2019-06-24 14:22:44 +06:30
Zoey
cd2e003945 kbzpay qrcode 2019-06-24 14:10:03 +06:30
Zoey
01fcb64da1 Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev 2019-06-24 14:02:18 +06:30
Zoey
7c44d7bd81 kbz pay qrcode; 2019-06-24 13:57:46 +06:30
Myat Zin Wai Maw
ae9d02333c Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev 2019-06-24 11:38:32 +06:30
Zoey
68b16eeee7 kbzpay qrcode 2019-06-24 10:19:10 +06:30
Nweni
259ef75295 Merge branch 'r-1902001-01-dev' of https://gitlab.com/code2lab/SXRestaurant into r-1902001-01-dev 2019-06-24 10:10:25 +06:30
Nweni
ae373fe365 callback kbzpay 2019-06-24 10:10:01 +06:30
Myat Zin Wai Maw
b3e5a3cf6e Merge branch 'r-1902001-01' into r-1902001-01-dev 2019-06-21 16:01:51 +06:30
Myat Zin Wai Maw
1c478ae632 update order 2019-06-21 16:01:05 +06:30
Myat Zin Wai Maw
deee65f938 Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev 2019-06-21 15:34:21 +06:30
Myat Zin Wai Maw
ae2144cca9 Inventory Issue 2019-06-21 15:33:34 +06:30
NyanLinHtut
50c51d0b55 fixed conflit 2019-06-21 15:19:52 +06:30
NyanLinHtut
0bef0da992 - 2019-06-21 15:10:25 +06:30