yamin
1aea52619a
UI change
2017-10-23 11:38:10 +06:30
Zin Lin Phyo
784e740da3
rename in_juty to in_duty
2017-09-06 11:18:02 +06:30
Nweni
b99c503afa
inventory
2017-08-25 09:40:59 +06:30
Nweni
81f430b5c6
inventory setup
2017-08-24 18:04:42 +06:30
Zin Lin Phyo
874a9b60be
create InJuty
2017-08-23 15:02:27 +06:30
Zin Lin Phyo
74c2955ef0
create productCommission
2017-08-22 11:08:49 +06:30
Zin Lin Phyo
618f5f3b7c
commssions
2017-08-21 16:11:51 +06:30
Zin Lin Phyo
2a736cc92f
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
...
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant: (71 commits)
Update
Coupon / Voucher data change
update menu_sync
update addorder
update addorder view
add fields for Menu Sync
update add oreder
add menu api
update add order and calculate subtotal
update seed
menu ui update
update ability for setmenu
fixed
update show for foc
add bootstrap file input and menu item img implemented
update foc and pdf
update menu item
update receipt bill pdf for foc and credit
add CarrierWave gems for menu image upload
add CarrierWave gems for menu image upload
...
2017-08-21 13:30:28 +06:30
Zin Lin Phyo
7b0db433c4
commissioner scaffold
2017-08-21 13:30:04 +06:30
Yan
a1df5a0dbc
update menu_sync
2017-08-18 19:46:43 +06:30
Yan
3160aab399
merge with addorder
2017-08-17 18:59:22 +06:30
Yan
f2829fab0f
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
2017-08-17 13:50:24 +06:30
Aung Myo
865c2c5cdd
update add order
2017-08-17 09:54:19 +06:30
Phyo
fc2927b341
Promotion CRUD
2017-08-16 18:36:23 +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
03a6208a76
add item set with scaffold
2017-08-11 17:41:10 +06:30
Nweni
b0ad2049c5
dining_charges
2017-08-11 13:34:30 +06:30
Aung Myo
c93b50d46a
update conflict oragimi.scss
2017-07-26 10:04:49 +06:30
Yan
bf9b977cd0
membership update
2017-07-24 19:24:43 +06:30
Aung Myo
2d55ea0dab
update add order
2017-07-07 09:56:18 +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
f762664912
update bill
2017-06-27 14:16:48 +06:30
Aung Myo
4c13be257b
update authroize
2017-06-26 22:45:34 +06:30
Min Zeya Phyo
1ea9125f80
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
...
# Conflicts:
# Gemfile.lock
# app/views/layouts/application.html.erb
2017-06-26 21:57:55 +06:30
Min Zeya Phyo
b607154037
New Login form
2017-06-26 21:56:13 +06:30
Aung Myo
01e5b7ba6c
update authorize
2017-06-23 09:41:48 +06:30
Aung Myo
0943808ac8
finished order and sales in setting
2017-06-12 00:45:59 +06:30
Aung Myo
eb001275c7
fixed conflict
2017-06-11 18:09:00 +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
Aung Myo
35277ac000
queue and crm view updated
2017-06-09 09:29:25 +06:30
Moe Su
74b0550c30
payment_setting
2017-06-08 17:57:29 +06:30
Moe Su
e2ecfaeaad
For pull
2017-06-07 18:11:03 +06:30
Yan
03ae60d2e6
merge all 03062017
2017-06-03 12:50:08 +06:30
Aung Myo
030d3ffb0f
confict clear
2017-06-02 19:22:01 +06:30
Aung Myo
01fefe3b79
account working
2017-06-02 19:16:14 +06:30
Yan
ea082f0d43
creating order queue printer
2017-06-02 19:01:28 +06:30
Cherry
9afe39b7e2
commit for sales
2017-06-02 17:48:03 +06:30
Yan
6d705e2860
merge with master
2017-06-02 16:52:58 +06:30
Yan
022a2e005f
initial print setup
2017-06-02 16:22:15 +06:30
Yan
7e46e3c634
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
2017-06-02 14:58:29 +06:30
Aung Myo
92a82f6e7f
missing bookings controller adding
2017-06-02 14:52:14 +06:30
Min Zeya Phyo
d7d29e4d16
sales listing under transacitons
2017-05-29 18:55:34 +06:30
Min Zeya Phyo
08f993d621
Order queue stations
2017-05-28 13:30:30 +06:30
Min Zeya Phyo
0af7d78c3c
scaffold models
2017-04-20 17:01:14 +06:30
Min Zeya Phyo
0a97947259
api integrated
2017-04-19 19:39:58 +06:30
