Commit Graph

1432 Commits

Author SHA1 Message Date
phyusin
57a6f03917 image import from csv 2018-06-21 15:42:11 +06:30
phyusin
6ed3cb64e8 checked shift open or not 2018-06-21 14:28:01 +06:30
phyusin
9c6edffd59 menu export import 2018-06-21 11:33:22 +06:30
phyusin
84084303f4 check tax for promo activated 2018-06-20 14:57:52 +06:30
phyusin
ac5fda7c2a change promotion item query for bill 2018-06-20 11:09:14 +06:30
phyusin
994b104239 check print_settings is active or not in check-out 2018-06-20 09:26:53 +06:30
San Wai Lwin
555ff6e684 Delect Lookup for check in out 2018-06-19 10:48:56 +06:30
San Wai Lwin
234c00f105 pull from master 2018-06-18 16:14:59 +06:30
San Wai Lwin
25a8381681 Add Check in out pdf 2018-06-18 16:05:54 +06:30
phyusin
425e72afe7 add payment type in order reservation 2018-06-11 16:19:59 +06:30
phyusin
c8642548e5 check order reservation update and payment route fixed 2018-06-08 16:50:06 +06:30
Aung Myo
58cb957078 update promotion for nil item 2018-06-07 16:13:10 +06:30
Aung Myo
2445f43994 Merge branch 'adminbsb_material_ui' 2018-06-06 15:54:40 +06:30
Aung Myo
1014e2226c update valid time menu 2018-06-06 15:53:45 +06:30
phyusin
2cc52bd888 change saleitem query and js for order reservation 2018-06-06 11:47:21 +06:30
phyusin
dd58daa056 check customer 2018-06-05 15:38:42 +06:30
phyusin
7f04c284c6 customer update from doemal order 2018-06-05 13:28:36 +06:30
phyusin
d28d62a937 check customer contact no 2018-06-05 10:49:12 +06:30
EikhantMon
73947229a7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-06-01 17:14:12 +06:30
EikhantMon
767386e750 change item_width in customise pdf 2018-06-01 17:13:40 +06:30
Aung Myo
b1adb9810f update promotio for netprice and percentage 2018-06-01 16:19:41 +06:30
Aung Myo
0d0e16e4b4 update order 2018-05-31 17:42:55 +06:30
Aung Myo
9bcae0807e update order 2018-05-31 17:42:33 +06:30
Aung Myo
b99ca30342 Merge branch 'adminbsb_material_ui' 2018-05-31 16:42:16 +06:30
Aung Myo
8e9e286965 update promotion 2018-05-31 16:41:13 +06:30
Aung Myo
7419bb6bb8 Merge branch 'adminbsb_material_ui' 2018-05-31 15:49:29 +06:30
Aung Myo
dfec757e5f update promotion and takeaway for quickservice 2018-05-31 15:44:52 +06:30
phyusin
d9b0a2e629 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-31 10:31:08 +06:30
phyusin
c1961720c8 change action cable issue for quick service 2018-05-31 10:29:38 +06:30
Aung Myo
49d444a0df Merge branch 'adminbsb_material_ui' 2018-05-30 18:09:25 +06:30
Aung Myo
e24d6006c3 update promotion 2018-05-30 17:38:02 +06:30
phyusin
a862cf9ef9 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-30 14:17:41 +06:30
phyusin
6472dbeacb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-30 14:17:13 +06:30
phyusin
995c3a05d2 add other payments in close cashier 2018-05-30 14:16:43 +06:30
Aung Myo
6cc8679512 Merge branch 'adminbsb_material_ui' 2018-05-30 13:20:46 +06:30
Aung Myo
2c0a0f6030 update saleitem query and receipt bill pdf for promotion 2018-05-30 13:19:39 +06:30
Aung Myo
b5accc553e Merge branch 'adminbsb_material_ui' 2018-05-30 10:45:39 +06:30
Aung Myo
ef43e9aff3 salitem query original 2018-05-30 10:44:50 +06:30
phyusin
a9070ebe0d add override sale tax for member discount 2018-05-30 10:20:36 +06:30
Aung Myo
fee2a0431f Merge branch 'adminbsb_material_ui' 2018-05-29 16:55:11 +06:30
Aung Myo
63751d047b update promotion 2018-05-29 16:54:21 +06:30
phyusin
776479a74e remove conflict data 2018-05-29 14:32:37 +06:30
phyusin
930e8d29d5 add new payment for aston request 2018-05-29 14:29:38 +06:30
Aung Myo
3527ef17d9 Merge branch 'adminbsb_material_ui' 2018-05-29 10:44:49 +06:30
Aung Myo
a062c5574a update sale receipt no repoet 2018-05-29 10:39:09 +06:30
phyusin
bf9bb1c58a transactions for order reservation and api for tax profile 2018-05-28 18:08:30 +06:30
phyusin
0ff21a88cd remove conflict 2018-05-28 10:52:51 +06:30
phyusin
c4cefb05ae conflict data 2018-05-28 10:46:04 +06:30
EikhantMon
7ddbd7d78a conflit modified changes 2018-05-25 17:44:36 +06:30
San Wai Lwin
3c8e3c5326 Add Order Set Pdf 2018-05-25 17:06:45 +06:30