Commit Graph

154 Commits

Author SHA1 Message Date
Aung Myo
285ad93501 update filter in sale and order and creditnote 2017-08-08 09:43:58 +06:30
Aung Myo
a7cbea5dbb update login To show dashboard screen with available features based on user type 2017-07-24 17:42:34 +06:30
Yan
d51b1a0b9e disable cable and oqs qty can 0 2017-07-04 18:56:52 +06:30
superuser
60dee30046 api/bill_controller edited 2017-06-30 19:29:09 +06:30
Aung Myo
1d08954a76 update shift sale 2017-06-30 13:32:56 +06:30
Aung Myo
ab7f08b1d6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-28 12:47:18 +06:30
Min Zeya Phyo
ee651763b7 shift close and payment journal 2017-06-28 10:34:42 +06:30
Aung Myo
53ff3989b5 update merge cancan 2017-06-27 16:55:56 +06:30
Aung Myo
4c13be257b update authroize 2017-06-26 22:45:34 +06:30
superuser
9fa6ad920e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 20:02:39 +06:30
Yan
f60b3d554a add table and order no in oqs 2017-06-26 16:23:00 +06:30
Yan
ecc9ab53ec Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 09:59:16 +06:30
Yan
a91816bb4e qty edit in oqs 2017-06-25 22:41:26 +06:30
Yan
30df25d78a Merge branch 'master' into oqs 2017-06-23 19:22:07 +06:30
Yan
e9fb90d8a0 updating oqs 2017-06-23 19:00:49 +06:30
superuser
4dbc9b6134 :q
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-23 18:00:18 +06:30
Yan
27ff8b89e7 merge with crm 2017-06-23 17:51:09 +06:30
Aung Myo
f5f0f9e077 update crm customer and bind customer and queue 2017-06-23 17:03:52 +06:30
Aung Myo
01e5b7ba6c update authorize 2017-06-23 09:41:48 +06:30
superuser
ea74d52a6f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 18:26:36 +06:30
Yan
7bf2499e83 add options in oqs 2017-06-22 17:32:13 +06:30
superuser
e0af272690 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 11:39:56 +06:30
superuser
27b0ba72d7 changed in server master 2017-06-22 11:38:42 +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
6c4c817453 fixed fonflict 2017-06-21 10:22:43 +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
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
superuser
d4c087990b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 19:56:56 +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
superuser
2fe8f77bac Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-16 09:43:05 +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