Commit Graph

171 Commits

Author SHA1 Message Date
Phyo
46ad87314a Add color blue to orders 2017-06-26 14:39:25 +06:30
Yan
e01ecc6e0f merge origin master 2017-06-23 17:53:53 +06:30
Yan
27ff8b89e7 merge with crm 2017-06-23 17:51:09 +06:30
Nweni
81c50f220a edit invoice 2017-06-23 17:37:08 +06:30
Aung Myo
f5f0f9e077 update crm customer and bind customer and queue 2017-06-23 17:03:52 +06:30
Phyo
68403617a5 Change Font and show status in origami 2017-06-23 11:14:48 +06:30
Yan
8ee37c5b52 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 18:03:55 +06:30
Yan
7bf2499e83 add options in oqs 2017-06-22 17:32:13 +06:30
Aung Myo
cd5fdaac6a update origami scss 2017-06-22 15:28:40 +06:30
Aung Myo
187caa5253 update customre 2017-06-22 11:58:16 +06:30
Aung Myo
de38a50522 Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-22 09:34:45 +06:30
Aung Myo
d95b7c7abc add confirm js and css 2017-06-21 19:20:10 +06:30
Aung Myo
d2549df2e9 update receipt bill payment 2017-06-21 17:37:16 +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
Nweni
f69bee9b03 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-20 19:00:02 +06:30
Aung Myo
0e619f3f2a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-20 17:59:14 +06:30
Aung Myo
33cb8b64a3 finished customer form and update 2017-06-20 17:57:50 +06:30
Yan
e43818fdf5 oqs updated 2017-06-20 13:33:41 +06:30
Aung Myo
faae996d5d Rebate balance in receipt 2017-06-20 11:31:02 +06:30
Nweni
a71ee3657a origami changes 2017-06-20 07:36:38 +06:30
Yan
7fe36e8ef4 merge with settings 2017-06-19 19:14:58 +06:30
Phyo
90be2b8d63 OQS edit bug fix 2017-06-19 18:54:19 +06:30
Aung Myo
675d83c80f sale item report and rebate balance 2017-06-19 11:54:34 +06:30
Yan
b65d127fd0 bill print format and tax fix 2017-06-18 20:07:28 +06:30
Yan
6d0cfd17ac merge with origin master 2017-06-18 12:50:07 +06:30
Yan
74c6f3cebc Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-18 12:10:30 +06:30
Yan
f33f11df64 rescue member call and update oqs and js route bug 2017-06-18 03:20:19 +06:30
Yan
80320b6d3e oqs updated 2017-06-18 00:45:39 +06:30
Aung Myo
b62d5349c6 assign queue and other bug 2017-06-18 00:03:09 +06:30
Nweni
e55ab32fad Update 2017-06-17 16:00:56 +06:30
Yan
420e1b9cbc all info details in oqs 2017-06-17 14:15:08 +06:30
Aung Myo
cb43afc405 update bug sale 2017-06-16 18:04:39 +06:30
Aung Myo
0e21117f05 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 10:22:21 +06:30
Aung Myo
f06235c2cf Merge branch 'crm' 2017-06-16 10:21:56 +06:30
Aung Myo
f0ea6f3c56 finish reprint 2017-06-15 19:07:33 +06:30
Yan
03feae5b0f fix get_order_items_details method in order_item and add taxes in receipt 2017-06-15 17:57:58 +06:30
Yan
77049176f6 oqs and zone for seed 2017-06-15 16:47:04 +06:30
Aung Myo
71c3b2f451 update tether 2017-06-15 14:06:26 +06:30
Yan
061c06b3c3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-15 11:25:49 +06:30
Yan
cca890ffdd disable auto reload origami 2017-06-15 11:25:13 +06:30
Phyo
a600838c50 Bug Fix with Production 2017-06-15 11:05:13 +06:30
Yan
8cfa2bc5c5 payment bill added and origami bug fixed 2017-06-14 19:41:32 +06:30
Yan
dd9863025f prepare for payment bill 2017-06-14 18:15:01 +06:30
Yan
ac7d99362d Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 16:52:54 +06:30