373 Commits

Author SHA1 Message Date
Moe Su
33cc576f1e edit membership setting , otherpayment page 2017-06-11 15:48:53 +06:30
Yan
4c29aad299 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-09 13:47:19 +06:30
Yan
a100d742e6 add crm order printer in seed 2017-06-09 13:47:00 +06:30
Nweni
56ffd1f063 update sale order talble 2017-06-09 13:13:20 +06:30
Aung Myo
406172c6ff fixed conflict 2017-06-09 12:04:36 +06:30
Yan
1d472aa2e1 add req bill seed 2017-06-09 10:26:06 +06:30
Aung Myo
35277ac000 queue and crm view updated 2017-06-09 09:29:25 +06:30
Yan
75c8936eff updated default who changed oqs in queue job 2017-06-08 19:26:47 +06:30
Yan
43e89cefda re-add account migration 2017-06-08 19:12:11 +06:30
Yan
1cbbe9d672 Merge branch 'discount' 2017-06-08 18:58:28 +06:30
Yan
71e09ef452 comment for cable and add print seed 2017-06-08 18:57:53 +06:30
Moe Su
0bcd612bc2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-08 17:57:43 +06:30
Moe Su
74b0550c30 payment_setting 2017-06-08 17:57:29 +06:30
Yan
395250fd47 delete duplicate account migration 2017-06-08 15:48:22 +06:30
Moe Su
b57e24c076 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-08 15:17:45 +06:30
Moe Su
664fe2f6e1 Adding Redeem at payment 2017-06-08 15:17:26 +06:30
Nweni
d6a455b135 fixed conflict 2017-06-08 09:57:33 +06:30
Nweni
3cf00faab8 Update 2017-06-08 09:56:13 +06:30
Moe Su
26f2dce142 For Pull 2017-06-08 09:53:04 +06:30
Yan
4d4c40cc17 a little change for setup 2017-06-08 09:48:24 +06:30
Yan
b395e2e6f1 updated seed for customer 2017-06-07 19:10:57 +06:30
Yan
f746c18238 (important)migrateion files changed 2017-06-07 18:47:50 +06:30
Yan
a601cf6d75 editing migration 2017-06-07 18:08:44 +06:30
Yan
df138d94ba merged master 2017-06-07 17:45:40 +06:30
Nweni
4323da6589 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-07 14:45:22 +06:30
Nweni
810a6d8afc update sale_payment database 2017-06-07 14:45:03 +06:30
PhyoTheingi
ad5d41768d Fix conflict 2017-06-07 11:02:53 +06:30
PhyoTheingi
608cd5bb21 update seed 2017-06-07 10:53:15 +06:30
PhyoTheingi
52cc294696 merge with master 2017-06-07 10:33:30 +06:30
PhyoTheingi
59434e2c3a Menu item with Accout 2017-06-06 17:29:34 +06:30
Yan
d28449a9c9 updated for bill print 2017-06-06 14:34:24 +06:30
Yan
f1877408be fixed for pm key changed 2017-06-05 18:52:19 +06:30
Yan
f004db9b19 updated migration code 2017-06-05 15:06:34 +06:30
Min Zeya Phyo
394d2ed938 change transactional primary key to custom ID for better portability 2017-06-03 19:12:35 +06:30
Min Zeya Phyo
9dddd2fc78 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant 2017-06-03 15:05:25 +06:30
Yan
03ae60d2e6 merge all 03062017 2017-06-03 12:50:08 +06:30
Aung Myo
01fefe3b79 account working 2017-06-02 19:16:14 +06:30
Yan
022a2e005f initial print setup 2017-06-02 16:22:15 +06:30
Yan
356923a9d8 pull master 2017-06-01 12:11:23 +06:30
Yan
2a323c8d0d deleted order queue item 2017-06-01 12:07:27 +06:30
Min Zeya Phyo
0189c01e04 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant 2017-05-31 23:50:06 +08:00
Yan
5a564abca9 oqs sample 2017-05-31 22:14:46 +06:30
Aung Myo
f036274f5e finished order tab view and customer tab 2017-05-31 18:19:51 +06:30
Nweni
7e7b89e143 added order_queue_item 2017-05-31 13:40:48 +06:30
Min Zeya Phyo
516b854fba shop_setup branch 2017-05-30 23:46:22 +08:00
Min Zeya Phyo
9361e24a8a remove sale_discount from model list 2017-05-30 12:42:50 +06:30
Min Zeya Phyo
d7d29e4d16 sales listing under transacitons 2017-05-29 18:55:34 +06:30
Min Zeya Phyo
08f993d621 Order queue stations 2017-05-28 13:30:30 +06:30
Min Zeya Phyo
c1c72eca30 more controller for cashier/waiter view 2017-05-10 01:10:21 +06:30
Min Zeya Phyo
62e8615f12 receipt update 2017-04-22 00:09:07 +06:30