Commit Graph

319 Commits

Author SHA1 Message Date
Yan
513530e8f3 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-15 16:42:32 +06:30
Yan
e69eeadb6e add bootstrap file input and menu item img implemented 2017-08-15 16:27:40 +06:30
Aung Myo
997cc0733c add item set and menu item set CRUD 2017-08-14 17:57:55 +06:30
Yan
edb4ab0425 Merge branch 'master' into menu_sync 2017-08-14 15:34:19 +06:30
Yan
739efa8baf Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-14 14:40:43 +06:30
Aung Myo
069ad16733 update oqs filtring 2017-08-14 13:42:47 +06:30
Yan
03a6208a76 add item set with scaffold 2017-08-11 17:41:10 +06:30
Aung Myo
10aae022d2 update oqs 2017-08-11 16:47:57 +06:30
Nweni
b0ad2049c5 dining_charges 2017-08-11 13:34:30 +06:30
Aung Myo
2c7a641d47 update oqs 2017-08-11 13:21:40 +06:30
Aung Myo
5684d5d0c7 update oqs 2017-08-11 12:15:30 +06:30
Aung Myo
9eaf04778c update oqs 2017-08-11 10:25:09 +06:30
Aung Myo
362789a93e update oqs 2017-08-10 18:19:07 +06:30
Aung Myo
285ad93501 update filter in sale and order and creditnote 2017-08-08 09:43:58 +06:30
Aung Myo
c93b50d46a update conflict oragimi.scss 2017-07-26 10:04:49 +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
Aung Myo
2d55ea0dab update add order 2017-07-07 09:56:18 +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