Commit Graph

295 Commits

Author SHA1 Message Date
Aung Myo
ce8581f892 fixed conflic when pull master item remark 2018-02-26 17:02:46 +06:30
Aung Myo
b38e98a22a update edit with remark 2018-02-26 16:56:57 +06:30
phyusin
5523ff6fc1 check product sale report 2018-02-26 11:24:47 +06:30
phyusin
f559aa0f14 product sale query 2018-02-26 09:20:57 +06:30
Aung Myo
f4f5915532 update waiter view add order 2018-02-26 09:19:14 +06:30
phyusin
970a9bb430 sale 2018-02-23 15:26:24 +06:30
phyusin
7c171057d1 product sale 2018-02-23 14:03:25 +06:30
Aung Myo
c7b77aebfa update taday list and addorder 2018-02-22 18:48:59 +06:30
phyusin
2cb13f9a62 change dashboard query 2018-02-22 10:10:20 +06:30
phyusin
eafbb80f51 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-22 09:44:14 +06:30
Aung Myo
c3af21d71c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-21 13:28:43 +06:30
Aung Myo
ebdf838b52 update request sale for another role 2018-02-21 13:12:41 +06:30
phyusin
76ccc36208 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-21 09:15:53 +06:30
phyusin
84c0a60c08 add filter for dashboard 2018-02-21 09:15:41 +06:30
Aung Myo
20103a54a5 update sale for request 2018-02-20 14:33:36 +06:30
Aung Myo
8f239cbb0b update conflix for request bill 2018-02-20 13:32:27 +06:30
Aung Myo
58d78b8674 Merge branch 'adminbsb_material_ui' 2018-02-20 13:25:00 +06:30
Aung Myo
a5640877a3 update request bill 2018-02-20 11:59:57 +06:30
Aung Myo
31adc0e993 update request bill for another role in request_bill_con and sale.rb 2018-02-20 11:13:49 +06:30
Aung Myo
817784796a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-19 14:52:46 +06:30
phyusin
d134e3f67d add survey for waiter 2018-02-19 14:43:34 +06:30
phyusin
dc5cd84f5c show cashier dashboard view 2018-02-19 13:46:08 +06:30
phyusin
150ff66446 change slae item query 2018-02-19 10:49:24 +06:30
Aung Myo
2f7f412150 update addorder move + and box 2018-02-16 09:46:55 +06:30
Aung Myo
cf644892c9 update pending and quick service 2018-02-15 15:26:34 +06:30
Aung Myo
0d515d9c93 paending order sale model 2018-02-15 10:27:00 +06:30
Aung Myo
08e372cfb5 udpdate qs 2018-02-14 13:46:22 +06:30
Aung Myo
edade3662b update quickservice 2018-02-09 11:32:29 +06:30
Aung Myo
8e2ec90ee6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-08 11:09:21 +06:30
Aung Myo
38dc13ecf7 update pending order 2018-02-08 11:08:52 +06:30
Aung Myo
313bcd5db9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2018-02-06 17:02:44 +06:30
phyusin
f84b01a058 change item unit price in sale ite report 2018-02-06 10:19:30 +06:30
Aung Myo
9efd54e68b update remove job from cable and cup control in print 2018-02-01 15:30:30 +06:30
Aung Myo
2f024e8691 update qurick raw 2018-02-01 10:29:24 +06:30
phyusin
2a09945d36 check add to existing invoice 2018-01-28 16:29:59 +06:30
phyusin
aa129ad469 heck rounding adjustment error 2018-01-28 16:12:59 +06:30
phyusin
61142b7244 add void in sale item again 2018-01-25 17:34:13 +06:30
phyusin
3c37852250 change query in sale 2018-01-25 14:24:59 +06:30
phyusin
8b99c8bcc6 cahnge empty json to NIL 2018-01-22 22:13:17 +06:30
phyusin
f28388ada1 change menu category code error in sale item 2018-01-22 16:19:13 +06:30
Aung Myo
57425a6bc9 update sale item for set menu 2018-01-19 11:44:30 +06:30
Aung Myo
9396982261 update sale item price 0 2018-01-17 10:39:46 +06:30
phyusin
2d2a154c17 check multiple other payments in receipt 2018-01-11 11:46:05 +06:30
Yan
4378a3c5c4 Merge branch 'bank_integration' of bitbucket.org:code2lab/sxrestaurant 2018-01-10 18:16:41 +06:30
phyusin
903dddd8cc CB ECR Integration 2018-01-10 18:08:28 +06:30
Aung Myo
6aab87a89d update sale item report qty sum 2018-01-09 12:04:56 +06:30
phyusin
ae6caefaa0 change query in sale item report 2018-01-05 13:33:23 +06:30
Aung Myo
09db9656c5 update sale item desc 2018-01-03 12:22:09 +06:30
Aung Myo
490f651b7f update sale model 2018-01-02 16:07:22 +06:30
Aung Myo
e27b468db1 update request bill with booking.checkout_at nil4 2018-01-02 15:36:03 +06:30