Commit Graph

184 Commits

Author SHA1 Message Date
Yan
c3e511c8ed fix menu edit 2017-08-22 14:11:25 +06:30
Nweni
44f02be4cb nested form 2017-08-22 14:11:13 +06:30
Phyo
e3c1dd216a Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-21 17:40:44 +06:30
Phyo
e9ba56826c Promotion Product Add 2017-08-21 17:38:07 +06:30
Yan
2b0dcd4ab9 update and fix 2017-08-21 16:50:24 +06:30
Yan
a1df5a0dbc update menu_sync 2017-08-18 19:46:43 +06:30
Yan
48461da9ea add fields for Menu Sync 2017-08-18 11:24:38 +06:30
Yan
29b3f94573 add menu api 2017-08-17 18:55:13 +06:30
Yan
f2829fab0f Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-17 13:50:24 +06:30
Phyo
0138ae2efa Fix Conflict 2017-08-16 18:38:41 +06:30
Phyo
fc2927b341 Promotion CRUD 2017-08-16 18:36:23 +06:30
Yan
0eee1fd0af menu ui update 2017-08-16 18:26:30 +06:30
yamin
4fc748e877 CRUDforProducts 2017-08-16 18:19:20 +06:30
yamin
3e9b9c6b8b CalculatePriceInDiningCharges 2017-08-16 10:46:03 +06:30
Yan
e0789ecb97 Merge branch 'menu_sync' of bitbucket.org:code2lab/sxrestaurant 2017-08-15 17:24:46 +06:30
Aung Myo
b2f00358f1 update ability for setmenu 2017-08-15 17:24:06 +06:30
Yan
20bba0f659 merge with august_spring 2017-08-15 17:04:28 +06:30
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
Yan
f018a56027 add CarrierWave gems for menu image upload 2017-08-14 18:53:39 +06:30
Aung Myo
997cc0733c add item set and menu item set CRUD 2017-08-14 17:57:55 +06:30
yamin
5fc485615c UpdateDiningCharges 2017-08-14 16:49:39 +06:30
Yan
edb4ab0425 Merge branch 'master' into menu_sync 2017-08-14 15:34:19 +06:30
Phyo
af3a7c1d88 Room Charges Bug Fix 2017-08-14 15:33:13 +06:30
Yan
74d7adbaef deving item sets 2017-08-14 14:27:37 +06:30
Phyo
740038757d Dining Charges CRUD 2017-08-11 17:53:48 +06:30
Yan
03a6208a76 add item set with scaffold 2017-08-11 17:41:10 +06:30
Aung Myo
b3c77fc28c update lookup 2017-07-31 17:33:06 +06:30
Aung Myo
e34d267fc8 update control member for osaka 2017-07-12 19:43:56 +06:30
Phyo
53aa1f8ec6 OQS bug fix 2017-07-02 15:26:52 +06:30
Phyo
a86ac10e83 Zone OQS bug fix 2017-07-02 13:39:36 +06:30
Aung Myo
01e5b7ba6c update authorize 2017-06-23 09:41:48 +06:30
Aung Myo
25b6a893f2 first cancan 2017-06-22 15:33:55 +06:30
Aung Myo
6c4c817453 fixed fonflict 2017-06-21 10:22:43 +06:30
Aung Myo
4ab5c311eb update crm 2017-06-21 10:05:07 +06:30
Yan
242eb80081 defaults json in oqs for create 2017-06-20 18:25:45 +06:30
Phyo
90be2b8d63 OQS edit bug fix 2017-06-19 18:54:19 +06:30
Phyo
c02e305c30 Zone Created_at Bug Fix 2017-06-19 16:24:44 +06:30
Phyo
184dcb53a1 Conflict fix din settings_backend 2017-06-19 15:24:15 +06:30
Phyo
2dbbb17634 Add extra fields to accounts 2017-06-19 12:21:54 +06:30
Yan
0e7042f00f merge with settings_backend 2017-06-18 12:30:06 +06:30
Phyo
b093a993ba Zone and OQS 2017-06-17 18:00:59 +06:30
Yan
c40a2c78e7 oqs autoprint developing 2017-06-16 13:44:39 +06:30
Aung Myo
f0d3f30d88 update order queue , sale void 2017-06-15 16:24:00 +06:30
Aung Myo
3db6252304 update search and crm 2017-06-14 00:09:54 +06:30
Aung Myo
7194f0e971 update sale search 2017-06-13 15:04:51 +06:30
Aung Myo
0943808ac8 finished order and sales in setting 2017-06-12 00:45:59 +06:30
Moe Su
33cc576f1e edit membership setting , otherpayment page 2017-06-11 15:48:53 +06:30
Moe Su
1d24099abc For Pull 2017-06-11 13:58:34 +06:30
Nweni
aa8068ad10 Update 2017-06-11 13:02:03 +06:30