373 Commits

Author SHA1 Message Date
Yan
6b49e04589 clean seed 2017-12-13 15:37:05 +06:30
Yan
840e260c28 add for ygn bbq 2017-12-04 18:44:18 +06:30
Yan
51df43de44 remove paymal token in seed 2017-11-28 18:43:34 +06:30
Yan
f33be9e707 Merge branch 'master' into license 2017-11-28 17:07:58 +06:30
phyusin
c170974224 change promotion with menu item and menu item instance 2017-11-27 09:23:10 +06:30
Yan
a5a33b269a Merge branch 'master' into license 2017-11-24 10:15:37 +06:30
Yan
06582d755e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-22 18:40:38 +06:30
Aung Myo
fafd6df5e1 update addorder and show_account_info add shops 2017-11-22 16:49:34 +06:30
Yan
1fd4108ac0 change all sale item 2017-11-22 12:12:27 +06:30
phyusin
b75d8cc176 change supervisour to supervisor in db/seeds.eb 2017-11-22 10:31:55 +06:30
Yan
861e554d63 fix for dining charges taxable price and ui modified 2017-11-21 12:10:53 +06:30
Yan
22b5421603 dev done license 2017-11-20 19:15:32 +06:30
Yan
b046086ea4 Merge branch 'master' into license 2017-11-20 13:54:54 +06:30
Yan
a423807554 crm index ui and remove zone and dining from seed 2017-11-20 12:23:49 +06:30
phyusin
66e6b69f12 add booking for assign customer in CRM 2017-11-17 18:26:01 +06:30
Yan
34fd7a80d6 Merge branch 'master' into license 2017-11-17 10:25:32 +06:30
Yan
178b3484be added license 2017-11-16 16:13:26 +06:30
Yan
f8823360e3 add instance code to assigned_order_items 2017-11-15 17:59:32 +06:30
Aung Myo
28dbb75774 update rebate and update api 2017-11-14 18:30:57 +06:30
Aung Myo
0813cb5722 update design pages 2017-11-09 12:01:22 +06:30
Yan
21498fc714 update seed 2017-11-07 15:27:48 +06:30
Yan
7dd4bc87e4 update seed 2017-11-07 15:01:25 +06:30
Yan
0ad958d8a8 del migrating no need commission 2017-11-07 11:03:19 +06:30
Yan
4fa0705f1c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-07 10:32:48 +06:30
Aung Myo
b48625e25e update commission and seed for font 2017-11-07 10:31:10 +06:30
Yan
d5efe1402f add survey 2017-11-06 18:23:38 +06:30
yamin
382e9fd4fa inventory definition.coffee 2017-10-23 11:40:37 +06:30
yamin
1aea52619a UI change 2017-10-23 11:38:10 +06:30
Yan
95ef534b04 add cashier zone in ui 2017-10-23 10:53:22 +06:30
Yan
bcd86714e2 add cashier zones 2017-10-23 09:57:26 +06:30
Yan
4ab89efaf2 add font for print setting 2017-10-11 15:16:40 +06:30
Aung Myo
a6380fc77c update sym master sql 2017-09-21 14:11:28 +06:30
Aung Myo
274eebd19c update symmaster 2017-09-20 16:40:34 +06:30
Aung Myo
7191f0511c update sym master.sql 2017-09-19 18:02:23 +06:30
Aung Myo
6514fc5285 update sym_master.sql 2017-09-19 14:30:27 +06:30
Aung Myo
4779b6a19f update 2017-09-19 11:09:23 +06:30
Yan
b4ceff9631 add calc tax order flag in shop table 2017-09-11 13:56:49 +06:30
Yan
a50becb365 merge with august_spring 2017-09-06 18:32:45 +06:30
Zin Lin Phyo
784e740da3 rename in_juty to in_duty 2017-09-06 11:18:02 +06:30
Yan
a4884c9bea item instance code add to sale_item 2017-09-04 15:10:26 +06:30
Yan
e09559c508 merge with august spring but merge fail 2017-08-31 15:58:01 +06:30
Zin Lin Phyo
2ee08e943d for pull 2017-08-31 10:22:21 +06:30
Yan
51d8c986f1 merge with august_spring 2017-08-30 19:16:07 +06:30
Nweni
de45fb29b8 Update 2017-08-30 14:21:05 +06:30
Nweni
cabc78c373 inventory 2017-08-30 14:19:24 +06:30
Yan
901c6a786d update sync sql 2017-08-29 18:06:09 +06:30
Yan
a9b606730c fix for oqs print copy and update sym sql 2017-08-29 14:44:07 +06:30
Yan
e87209093b date format for promotion and add sync sql 2017-08-29 13:58:13 +06:30
Zin Lin Phyo
63d97cce26 fix conflit 2017-08-28 18:22:32 +06:30
Zin Lin Phyo
1cbea173df product commission transaction in commissioner 2017-08-28 18:17:22 +06:30