Yan
|
3160aab399
|
merge with addorder
|
2017-08-17 18:59:22 +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 |
|
Aung Myo
|
865c2c5cdd
|
update add order
|
2017-08-17 09:54:19 +06:30 |
|
yamin
|
4fc748e877
|
CRUDforProducts
|
2017-08-16 18:19:20 +06:30 |
|
Phyo
|
73cceaf482
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
|
2017-08-16 11:00:51 +06:30 |
|
Phyo
|
db43ae186c
|
DB for promtion, promotion product,product
|
2017-08-16 11:00:37 +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 |
|
Aung Myo
|
e4a2d58e5e
|
update foc and pdf
|
2017-08-15 15:14:55 +06:30 |
|
Zin Lin Phyo
|
74b15465f7
|
item foc in sale edit
|
2017-08-15 15:13:44 +06:30 |
|
Yan
|
f018a56027
|
add CarrierWave gems for menu image upload
|
2017-08-14 18:53:39 +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 |
|
Phyo
|
25ab7c9701
|
Payment Voucher UI fix
|
2017-08-14 13:41:18 +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 |
|
Nweni
|
b0ad2049c5
|
dining_charges
|
2017-08-11 13:34:30 +06:30 |
|
Aung Myo
|
362789a93e
|
update oqs
|
2017-08-10 18:19:07 +06:30 |
|
Yan
|
60089a3879
|
Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant
|
2017-07-31 13:15:23 +06:30 |
|
Aung Myo
|
98c04f21d8
|
update report and view
|
2017-07-28 17:07:16 +06:30 |
|
Yan
|
bf3e30c70f
|
control for member create and member discount
|
2017-07-27 18:53:41 +06:30 |
|
Aung Myo
|
83b8d72632
|
update add order
|
2017-07-26 15:04:35 +06:30 |
|
Aung Myo
|
c93b50d46a
|
update conflict oragimi.scss
|
2017-07-26 10:04:49 +06:30 |
|
Yan
|
6f57bb8a79
|
adding shift sale summary
|
2017-07-13 11:12:02 +06:30 |
|
Aung Myo
|
72aa769490
|
added member discount
|
2017-07-11 11:06:13 +06:30 |
|
Yan
|
9158f0e93a
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-07-08 17:34:22 +06:30 |
|
Aung Myo
|
8985393535
|
update receipt repoert
|
2017-07-08 10:25:22 +06:30 |
|
Yan
|
09e202bb70
|
remove deving member dis
|
2017-07-07 17:33:14 +06:30 |
|
Yan
|
1b0bcbffea
|
update for shift and deving member dis
|
2017-07-07 14:56:05 +06:30 |
|
Aung Myo
|
2d55ea0dab
|
update add order
|
2017-07-07 09:56:18 +06:30 |
|
Aung Myo
|
7f6a306097
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
|
2017-07-05 10:36:16 +06:30 |
|
Aung Myo
|
338673955f
|
update customer rebate
|
2017-07-05 10:34:11 +06:30 |
|
Yan
|
d51b1a0b9e
|
disable cable and oqs qty can 0
|
2017-07-04 18:56:52 +06:30 |
|
Aung Myo
|
b5b1c6f10a
|
update membership
|
2017-07-04 18:01:08 +06:30 |
|
Yan
|
6a09ef3018
|
merge with crm and room fixed
|
2017-07-03 17:47:34 +06:30 |
|
Yan
|
ed0e627f34
|
fixed at bitp and oqs print
|
2017-07-03 17:40:12 +06:30 |
|
Nweni
|
15cbac995f
|
fixed conflict
|
2017-07-03 10:26:26 +06:30 |
|
Nweni
|
399825b98c
|
Update
|
2017-07-03 10:24:35 +06:30 |
|
Yan
|
dac4c59007
|
add puma for de
|
2017-07-02 22:58:02 +06:30 |
|
superuser
|
ca797b8d9c
|
update conflict file
|
2017-07-02 14:37:21 +06:30 |
|
Aung Myo
|
78adf564e1
|
crong job and close cashier
|
2017-07-02 09:37:19 +06:30 |
|
Aung Myo
|
c26b80066b
|
update shift close print
|
2017-07-01 20:05:26 +06:30 |
|
Aung Myo
|
740f585a31
|
update rounding adj
|
2017-07-01 18:19:41 +06:30 |
|
Nweni
|
5f3708e11d
|
menu updated | edit qty updated
|
2017-07-01 17:15:12 +06:30 |
|
superuser
|
60dee30046
|
api/bill_controller edited
|
2017-06-30 19:29:09 +06:30 |
|
superuser
|
44faf2f56e
|
before pull
|
2017-06-30 14:19:30 +06:30 |
|
Yan
|
cae7157d8b
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-30 13:34:30 +06:30 |
|
Aung Myo
|
1d08954a76
|
update shift sale
|
2017-06-30 13:32:56 +06:30 |
|