Commit Graph

705 Commits

Author SHA1 Message Date
Yan
a90bbbebec merge with origin master 2017-06-22 18:06:56 +06:30
Yan
139c3c997a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 18:05:38 +06:30
Yan
618aed50dc merge with settings_backend 2017-06-22 18:05:23 +06:30
Yan
8ee37c5b52 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 18:03:55 +06:30
Yan
5d60d620b4 add for room tab and complete 2017-06-22 18:03:16 +06:30
Yan
7bf2499e83 add options in oqs 2017-06-22 17:32:13 +06:30
Nweni
0c0e44c808 move table 2017-06-22 16:31:41 +06:30
Yan
b30d81508c add options in oqs 2017-06-22 16:12:21 +06:30
Phyo
4254004423 Redeem Nett Button works 2017-06-22 15:36:36 +06:30
Aung Myo
4b9291110d update origami customer 2017-06-22 15:30:16 +06:30
Aung Myo
cd5fdaac6a update origami scss 2017-06-22 15:28:40 +06:30
Yan
cb40f06854 fixed for customer 2017-06-22 15:01:13 +06:30
Yan
f44abd5192 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 14:58:17 +06:30
Nweni
09252ba055 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 14:27:12 +06:30
Nweni
0ea2b778d1 multiple sale and order 2017-06-22 14:26:23 +06:30
Aung Myo
3d838bc989 update report and customer 2017-06-22 13:35:20 +06:30
Phyo
f8cab803f8 Redeem amount bug fic 2017-06-22 13:31:54 +06:30
Phyo
d1a4373171 Merge branch 'master' into settings_backend 2017-06-22 12:05:28 +06:30
Aung Myo
187caa5253 update customre 2017-06-22 11:58:16 +06:30
Yan
b13b0afa6c discuont updated for show 2017-06-22 11:31:05 +06:30
Aung Myo
54526230aa update customerbind in origami 2017-06-22 10:25:40 +06:30
Yan
bded56a696 customer seed updated 2017-06-22 10:11:50 +06:30
Aung Myo
7785ac99ef Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-22 09:53:43 +06:30
Yan
de8f577786 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:53:04 +06:30
Yan
77943f3bba Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:52:22 +06:30
Yan
3f15e7bc6f Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:51:22 +06:30
Aung Myo
de38a50522 Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-22 09:34:45 +06:30
Phyo
149b2b3559 Merge branch 'master' into settings_backend 2017-06-22 09:28:11 +06:30
Nweni
0ff10f2f32 move multiple order and sales 2017-06-22 05:51:42 +06:30
Nweni
168c571a23 multiple invoice 2017-06-22 05:24:31 +06:30
Yan
2525bfbdd9 discount updated 2017-06-21 20:30:12 +06:30
Aung Myo
d95b7c7abc add confirm js and css 2017-06-21 19:20:10 +06:30
Aung Myo
a6912d4e5b update customer search in card no 2017-06-21 18:30:51 +06:30
Aung Myo
3ba836b446 update customer transaction 2017-06-21 18:29:02 +06:30
Nweni
c7139609c4 move table 2017-06-21 18:26:03 +06:30
Aung Myo
d9d07a1cdc update reprint 2017-06-21 18:19:44 +06:30
Nweni
64210f30ac move table 2017-06-21 17:53:44 +06:30
Aung Myo
d2549df2e9 update receipt bill payment 2017-06-21 17:37:16 +06:30
Phyo
51252b99e3 Auto Refresh on/off 2017-06-21 17:01:44 +06:30
Aung Myo
7c5456d712 assign table ,membership transaction and queue 2017-06-21 16:22:53 +06:30
Yan
e3b3ff76b2 add account_id to od_item and sale_item table 2017-06-21 14:49:01 +06:30
Phyo
bd71cfd241 Clock Reality in Origami 2017-06-21 13:21:40 +06:30
Phyo
209a453ca9 other payments delete button doesn't work 2017-06-21 11:39:53 +06:30
Yan
9137436b70 bind origami show to action 2017-06-21 11:38:28 +06:30
Yan
e3c83cdd44 discount ui changed 2017-06-21 10:50:16 +06:30
Aung Myo
6c4c817453 fixed fonflict 2017-06-21 10:22:43 +06:30
Aung Myo
4ab5c311eb update crm 2017-06-21 10:05:07 +06:30
Nweni
b889603ce6 update 2017-06-21 09:33:39 +06:30
Nweni
6272e07959 add back action 2017-06-21 06:19:06 +06:30
Nweni
895e028e7c added cashier station time 2017-06-21 05:55:45 +06:30