Commit Graph

3824 Commits

Author SHA1 Message Date
phyusin
465ca98db0 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-31 11:05:05 +06:30
phyusin
6e643e67af move action cable func: 2018-05-31 11:04:27 +06:30
phyusin
d9b0a2e629 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-31 10:31:08 +06:30
phyusin
d3384064fc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-31 10:30:37 +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
3955d57cf0 payment ui changes 2018-05-29 16:28:45 +06:30
phyusin
e9bbc711dc aaudio play under origami 2018-05-29 16:01:56 +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
089630616d change tax override in payment page 2018-05-29 10:10:49 +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
phyusin
597bab756f Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-28 10:41:21 +06:30
phyusin
a1c85b79f1 add parenthesis in discount 2018-05-28 10:41:05 +06:30
San Wai Lwin
7dba4d2b45 pull from master 2018-05-28 09:44:13 +06:30
phyusin
11f8ff1f4c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-25 17:59:25 +06:30
phyusin
19543d3a55 remove filter for payment type in receipt no 2018-05-25 17:59:16 +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
EikhantMon
1ae55f1af2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-05-25 16:23:42 +06:30
EikhantMon
6c26dc4d5a item_slim_customise_pdf 2018-05-25 16:23:24 +06:30
San Wai Lwin
578c14ccc3 Pull from master 2018-05-25 16:22:30 +06:30
San Wai Lwin
f906134fbf Remove lookup settings in Order Pdf 2018-05-25 16:06:10 +06:30
phyusin
f6b951a472 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-25 15:27:19 +06:30
phyusin
5d63d38e4e add inclc in receipt bill 2018-05-25 15:25:39 +06:30
phyusin
b3e0e7e453 check survey params 2018-05-25 15:01:15 +06:30
phyusin
590b67abdf show incl exec in receipt bill 2018-05-25 14:46:40 +06:30
phyusin
6562336e90 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-05-25 13:29:25 +06:30
phyusin
5feea91584 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-25 13:27:18 +06:30
phyusin
49453a22c0 change tax profile overide 2018-05-25 13:26:55 +06:30
Aung Myo
7f6b0e0bdf update order api 2018-05-25 13:16:41 +06:30
Aung Myo
b7c6614537 upadte api order create process order 2018-05-25 13:14:57 +06:30
Aung Myo
29814f61f2 update addorder sort name 2018-05-24 18:13:10 +06:30
San Wai Lwin
d910c4078b Add Order item & summary customise font pdf 2018-05-24 17:02:54 +06:30
Aung Myo
7649728c4d update menu json for sort by name 2018-05-24 16:29:51 +06:30