Commit Graph

320 Commits

Author SHA1 Message Date
Yan
f4898017d1 price 0 print 2017-11-23 12:14:14 +06:30
Yan
06582d755e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-22 18:40:38 +06:30
Yan
6beb32348d major fix taxable price for sale and other sale and oqs 2017-11-22 18:39:35 +06:30
Aung Myo
fafd6df5e1 update addorder and show_account_info add shops 2017-11-22 16:49:34 +06:30
Aung Myo
d3ceba0a7a update add order 2017-11-22 15:54:58 +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
phyusin
55606cb959 autocomplete for CRM/QUEUE 2017-11-20 19:15:26 +06:30
Yan
2555efa186 add order double click fix 2017-11-17 18:43:42 +06:30
Yan
e95562ad20 edit addorder loading to oqs_loading 2017-11-17 18:27:48 +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
Aung Myo
6360a914b4 update add order for popup qty 2017-11-16 14:23:51 +06:30
Yan
059d1fc853 remove log in custom js 2017-11-15 19:15:20 +06:30
Yan
71a4b9b7e3 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-15 13:28:46 +06:30
phyusin
9647a28f91 dashboard chart UI 2017-11-15 13:27:42 +06:30
Aung Myo
f927d99807 update transaction 2017-11-14 15:48:22 +06:30
Aung Myo
6f06e7a9d7 add booking list in transaction 2017-11-14 13:42:00 +06:30
Aung Myo
f1a28d64e1 update OQS and cashier 2017-11-14 09:43:13 +06:30
Aung Myo
8db96beca0 update oqs view an d promotion form update 2017-11-10 14:32:21 +06:30
Aung Myo
f8cd712ad1 update feedback testing 2017-11-09 17:25:54 +06:30
Aung Myo
0813cb5722 update design pages 2017-11-09 12:01:22 +06:30
Aung Myo
7fe1ff5b22 update payment page 2017-11-08 17:14:18 +06:30
Yan
6dd0faee10 change ui for delete backend 2017-11-07 20:00:51 +06:30
Yan
9f09079b94 turbolink fixing 2017-11-07 18:52:09 +06:30
Yan
6596c90f02 turbolink fixing 2017-11-07 18:51:59 +06:30
Yan
8aa834a487 delete btn for menu item instance 2017-11-07 17:31:14 +06:30
Yan
7b2f928df0 test for jade 2017-11-07 12:32:50 +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
Yan
6fe447c7f3 upgrade 2017-10-31 18:55:16 +06:30
Yan
4660530218 upgrade version 2017-10-31 18:41:19 +06:30
Aung Myo
cfa819f985 fixed conflic 2017-10-31 12:13:19 +06:30
Aung Myo
56940d7f00 update sale audit 2017-10-31 12:08:27 +06:30
Yan
c1db3ba8be merge with aung myo 2017-10-30 18:52:48 +06:30
Yan
35161aae91 remove turbolink in backend and update logout 2017-10-30 18:51:05 +06:30
Yan
da0558b5ef remove turbolinks in form for conflict 2017-10-30 17:26:38 +06:30
Yan
7beb4e7563 test for turbolink 2017-10-30 14:33:05 +06:30
Aung Myo
a687b45193 update adminbsbs 2017-10-30 12:14:11 +06:30
Yan
8d12acb530 test for select 2017-10-30 10:09:22 +06:30
Yan
ae5dfaf192 test for no work js,it cause by turbolink 2017-10-29 14:20:24 +06:30
Yan
0a7da11aa1 new bsb version to old 2017-10-27 17:44:06 +06:30
Yan
5c27dcff66 merge with origin 2017-10-27 17:06:07 +06:30
Yan
61c9fd0c81 test for js 2017-10-27 16:53:32 +06:30
Yan
18aa3d1e0f ui updated 2017-10-27 11:37:47 +06:30