Commit Graph

226 Commits

Author SHA1 Message Date
Aung Myo
d95b7c7abc add confirm js and css 2017-06-21 19:20:10 +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
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
Nweni
b889603ce6 update 2017-06-21 09:33:39 +06:30
Nweni
6272e07959 add back action 2017-06-21 06:19:06 +06:30
Aung Myo
33cb8b64a3 finished customer form and update 2017-06-20 17:57:50 +06:30
Nweni
a71ee3657a origami changes 2017-06-20 07:36:38 +06:30
Nweni
fcd1590868 change query 2017-06-19 15:51:04 +06:30
Aung Myo
b62d5349c6 assign queue and other bug 2017-06-18 00:03:09 +06:30
Yan
7d6414cce6 auto reload page for oqs 5sec and origami 10sec 2017-06-14 15:59:08 +06:30
Aung Myo
871c37f04e update search 2017-06-14 00:11:03 +06:30
Aung Myo
3db6252304 update search and crm 2017-06-14 00:09:54 +06:30
Aung Myo
e5c29f6074 merge with report 2017-06-13 15:07:29 +06:30
Yan
d54fd19d1c report ui format 2017-06-13 14:59:00 +06:30
Aung Myo
b513aa22ab datepicker 2017-06-13 12:27:45 +06:30
Moe Su
21936fe3b0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 10:46:06 +06:30
Moe Su
59d53816bd Change style and redeem 2017-06-13 10:45:56 +06:30
Aung Myo
c05a64bae7 update customer amount 2017-06-13 10:36:40 +06:30
Cherry
a35dad8872 Merge branch 'master' of https://bitbucket.org/code2lab/sxrestaurant 2017-06-12 18:28:18 +06:30
Cherry
a247c142b8 ReceiptList Report Rough 2017-06-12 18:26:00 +06:30
Aung Myo
dc51beae43 fixed conflictfile 2017-06-12 15:01:19 +06:30
Nweni
ee208a5dcd Update 2017-06-12 13:26:09 +06:30
Yan
09f9a29cde merge with master 2017-06-12 10:01:36 +06:30
Aung Myo
0943808ac8 finished order and sales in setting 2017-06-12 00:45:59 +06:30
Yan
f834911587 to do req_bill_format and status changed after pay 2017-06-12 00:45:26 +06:30
Aung Myo
eb001275c7 fixed conflict 2017-06-11 18:09:00 +06:30
Nweni
31cc75462b fixed conflict 2017-06-11 15:52:13 +06:30
Nweni
b7bd68a461 payment keypad 2017-06-11 15:51:22 +06:30
Moe Su
33cc576f1e edit membership setting , otherpayment page 2017-06-11 15:48:53 +06:30
Aung Myo
406172c6ff fixed conflict 2017-06-09 12:04:36 +06:30
Yan
fe60ac818f update assets 2017-06-09 11:33:21 +06:30
Yan
54ef701482 updated miss origami css and js filename 2017-06-09 10:36:07 +06:30
Yan
39c20b221e updated miss origami css and js filename 2017-06-09 10:35:19 +06:30
Aung Myo
35277ac000 queue and crm view updated 2017-06-09 09:29:25 +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
fbc00bc3e4 merged loyalty 2017-06-08 15:28:09 +06:30
Yan
9866acf198 editing discout 2017-06-08 15:21:53 +06:30
Moe Su
6cc2e29e30 For pull 2017-06-07 18:13:12 +06:30
Moe Su
e2ecfaeaad For pull 2017-06-07 18:11:03 +06:30
Yan
be7d448c30 update gem file 2017-06-07 18:09:56 +06:30
Yan
df138d94ba merged master 2017-06-07 17:45:40 +06:30
Aung Myo
bd345dbc3f fixed conflict 2017-06-07 17:15:51 +06:30
Yan
114c4ee14d all changed for index in origami 2017-06-07 17:13:27 +06:30
Nweni
c18b57eca8 payment 2017-06-07 10:29:00 +06:30
Nweni
3c756949d1 payment 2017-06-06 15:32:24 +06:30
Aung Myo
d2ce74f648 bootstrap datepicker and customer save 2017-06-06 14:16:40 +06:30