Yan
|
1fd4108ac0
|
change all sale item
|
2017-11-22 12:12:27 +06:30 |
|
Yan
|
77ce2f32ff
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-22 10:40:34 +06:30 |
|
phyusin
|
b75d8cc176
|
change supervisour to supervisor in db/seeds.eb
|
2017-11-22 10:31:55 +06:30 |
|
phyusin
|
9e188104fb
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-11-22 10:23:39 +06:30 |
|
phyusin
|
2852a3bb93
|
change radio btn for CRM/New Registration
|
2017-11-22 10:22:52 +06:30 |
|
Aung Myo
|
749e271879
|
update saleitem rb syntax err
|
2017-11-22 09:59:13 +06:30 |
|
Yan
|
fb235f0b1c
|
puma update
|
2017-11-21 19:53:17 +06:30 |
|
Yan
|
6ce3f8e044
|
add sale items in sale item model
|
2017-11-21 19:33:20 +06:30 |
|
Yan
|
f7cad204af
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-21 18:36:58 +06:30 |
|
Aung Myo
|
3041d6a368
|
update search data in transaction
|
2017-11-21 18:29:41 +06:30 |
|
phyusin
|
efa591524f
|
origami discount UI
|
2017-11-21 17:44:43 +06:30 |
|
phyusin
|
0b374cf3b2
|
change UI for simple menu item, promotion, setting/OQS
|
2017-11-21 17:41:05 +06:30 |
|
Yan
|
25a3655909
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-21 17:33:00 +06:30 |
|
Yan
|
0fdc22b981
|
puma config
|
2017-11-21 17:31:40 +06:30 |
|
Aung Myo
|
01bf7caeb5
|
update oragimi view
|
2017-11-21 17:21:31 +06:30 |
|
Yan
|
9e1b82ffea
|
puma config
|
2017-11-21 17:20:24 +06:30 |
|
Yan
|
68937617f9
|
puma config
|
2017-11-21 17:14:08 +06:30 |
|
Aung Myo
|
789cc179d7
|
update addorder adn survey form select for foreigner
|
2017-11-21 17:00:20 +06:30 |
|
Aung Myo
|
59dca270c9
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2017-11-21 16:49:57 +06:30 |
|
Aung Myo
|
2b595ba212
|
update addorder for not have instance in item
|
2017-11-21 16:49:23 +06:30 |
|
Yan
|
7252e39515
|
merge with aung
|
2017-11-21 16:47:07 +06:30 |
|
Yan
|
ad66a6570b
|
add popper.js.map and remove .idea
|
2017-11-21 16:30:56 +06:30 |
|
Aung Myo
|
21bd0f9575
|
update sqa testing feedback
|
2017-11-21 16:04:45 +06:30 |
|
Yan
|
861e554d63
|
fix for dining charges taxable price and ui modified
|
2017-11-21 12:10:53 +06:30 |
|
phyusin
|
a92a1298a3
|
change <p> to <a> tag in autocomplete
|
2017-11-21 09:41:11 +06:30 |
|
Aung Myo
|
3eddb05ff8
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2017-11-21 09:23:15 +06:30 |
|
Aung Myo
|
71a03a56d4
|
update oqs view
|
2017-11-21 09:19:18 +06:30 |
|
phyusin
|
55606cb959
|
autocomplete for CRM/QUEUE
|
2017-11-20 19:15:26 +06:30 |
|
phyusin
|
51cda9dfb2
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-11-20 14:56:25 +06:30 |
|
Yan
|
a423807554
|
crm index ui and remove zone and dining from seed
|
2017-11-20 12:23:49 +06:30 |
|
phyusin
|
0a283d448e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-11-20 09:18:47 +06:30 |
|
Yan
|
3aac2629c9
|
queue card ui
|
2017-11-17 19:55:26 +06:30 |
|
Yan
|
2555efa186
|
add order double click fix
|
2017-11-17 18:43:42 +06:30 |
|
Yan
|
d5fb88a275
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-17 18:28:21 +06:30 |
|
Yan
|
e95562ad20
|
edit addorder loading to oqs_loading
|
2017-11-17 18:27:48 +06:30 |
|
phyusin
|
3a91568664
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-11-17 18:26:27 +06:30 |
|
phyusin
|
66e6b69f12
|
add booking for assign customer in CRM
|
2017-11-17 18:26:01 +06:30 |
|
Yan
|
c56fb1b0f4
|
oqs back turbolink control
|
2017-11-17 16:39:37 +06:30 |
|
Yan
|
11f040b142
|
fix oqs css and oqs edit turbolink control
|
2017-11-17 16:31:03 +06:30 |
|
Yan
|
6c03d0249c
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-17 15:51:40 +06:30 |
|
Yan
|
e7cd8deb8e
|
fix tester bugs
|
2017-11-17 15:51:20 +06:30 |
|
Aung Myo
|
30e6b46237
|
update backk buttom in oqs
|
2017-11-17 14:31:19 +06:30 |
|
Aung Myo
|
73da4841c6
|
update salepayment for puts
|
2017-11-17 13:50:27 +06:30 |
|
Yan
|
a3eb2e44eb
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-17 13:33:11 +06:30 |
|
Aung Myo
|
02bf6f03f1
|
update customer show
|
2017-11-17 11:58:46 +06:30 |
|
Aung Myo
|
393d0badc3
|
update customer transaction list
|
2017-11-17 11:47:42 +06:30 |
|
phyusin
|
f333aa9a66
|
add top10 and bottom10 products in dashboard
|
2017-11-17 10:22:04 +06:30 |
|
phyusin
|
e5831f92f9
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-11-17 10:03:59 +06:30 |
|
phyusin
|
4899e624ef
|
change dashboard ui
|
2017-11-17 09:56:40 +06:30 |
|
Aung Myo
|
cd7ae874b9
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2017-11-17 09:48:17 +06:30 |
|