Phyo
|
fc2927b341
|
Promotion CRUD
|
2017-08-16 18:36:23 +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 |
|
Nweni
|
2da60ce6e3
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
|
2017-08-15 11:15:41 +06:30 |
|
Nweni
|
e5a685f36e
|
room charges
|
2017-08-15 11:14:38 +06:30 |
|
yamin
|
fa68bcff69
|
removeDBcolsanddbparams
|
2017-08-14 14:26:16 +06:30 |
|
Nweni
|
b0ad2049c5
|
dining_charges
|
2017-08-11 13:34:30 +06:30 |
|
Yan
|
f46d786859
|
update crm
|
2017-08-08 14:29:48 +06:30 |
|
Aung Myo
|
1de6cc906c
|
update rounding adj for osaka
|
2017-07-26 16:35:34 +06:30 |
|
Yan
|
b2ccc12e17
|
add paypar acc for nfc
|
2017-07-16 18:16:52 +06:30 |
|
Aung Myo
|
e34d267fc8
|
update control member for osaka
|
2017-07-12 19:43:56 +06:30 |
|
Yan
|
3fe0f708bd
|
add req and fix for shift
|
2017-07-07 17:19:14 +06:30 |
|
Yan
|
1b0bcbffea
|
update for shift and deving member dis
|
2017-07-07 14:56:05 +06:30 |
|
Aung Myo
|
b5b1c6f10a
|
update membership
|
2017-07-04 18:01:08 +06:30 |
|
Aung Myo
|
740f585a31
|
update rounding adj
|
2017-07-01 18:19:41 +06:30 |
|
Yan
|
78be369a25
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-30 16:00:37 +06:30 |
|
Yan
|
b0bec2afc4
|
add alt name to order and sale items and update seeds
|
2017-06-30 16:00:03 +06:30 |
|
Nweni
|
2713fae6b5
|
Update
|
2017-06-30 13:44:29 +06:30 |
|
Nweni
|
5e3935f176
|
update shift
|
2017-06-30 13:10:28 +06:30 |
|
Yan
|
fbeab17b3c
|
merge with origin master
|
2017-06-29 14:08:20 +06:30 |
|
Nweni
|
618a89472a
|
shift open/close
|
2017-06-29 13:35:09 +06:30 |
|
Aung Myo
|
342b654f81
|
update print setting migration and delete unnessary font
|
2017-06-28 17:12:09 +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
|
945963362a
|
update queue migration
|
2017-06-27 15:25:13 +06:30 |
|
Aung Myo
|
f5f0f9e077
|
update crm customer and bind customer and queue
|
2017-06-23 17:03:52 +06:30 |
|
Aung Myo
|
187caa5253
|
update customre
|
2017-06-22 11:58:16 +06:30 |
|
Aung Myo
|
de38a50522
|
Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant into crm
|
2017-06-22 09:34:45 +06:30 |
|
Yan
|
2525bfbdd9
|
discount updated
|
2017-06-21 20:30:12 +06:30 |
|
Aung Myo
|
7c5456d712
|
assign table ,membership transaction and queue
|
2017-06-21 16:22:53 +06:30 |
|
Yan
|
e3b3ff76b2
|
add account_id to od_item and sale_item table
|
2017-06-21 14:49:01 +06:30 |
|
Aung Myo
|
0e619f3f2a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
|
2017-06-20 17:59:14 +06:30 |
|
Aung Myo
|
33cb8b64a3
|
finished customer form and update
|
2017-06-20 17:57:50 +06:30 |
|
Yan
|
e43818fdf5
|
oqs updated
|
2017-06-20 13:33:41 +06:30 |
|
Yan
|
7fe36e8ef4
|
merge with settings
|
2017-06-19 19:14:58 +06:30 |
|
Yan
|
c95b0130dc
|
edit migrate oqs
|
2017-06-19 18:56:36 +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 |
|
Yan
|
74c6f3cebc
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging
|
2017-06-18 12:10:30 +06:30 |
|
Aung Myo
|
b62d5349c6
|
assign queue and other bug
|
2017-06-18 00:03:09 +06:30 |
|
Phyo
|
b093a993ba
|
Zone and OQS
|
2017-06-17 18:00:59 +06:30 |
|
Yan
|
58bc13e8b6
|
add auto_print field to migration
|
2017-06-16 11:14:47 +06:30 |
|
Aung Myo
|
dc51beae43
|
fixed conflictfile
|
2017-06-12 15:01:19 +06:30 |
|
Aung Myo
|
e90178cfdc
|
finished CRM and customer
|
2017-06-12 14:23:20 +06:30 |
|
Yan
|
09f9a29cde
|
merge with master
|
2017-06-12 10:01:36 +06:30 |
|
Min Zeya Phyo
|
7eaea8f08d
|
fixed jsonb to json to support both mysql and postgres
|
2017-06-12 07:40:40 +06:30 |
|
Aung Myo
|
0943808ac8
|
finished order and sales in setting
|
2017-06-12 00:45:59 +06:30 |
|
Yan
|
f834911587
|
to do req_bill_format and status changed after pay
|
2017-06-12 00:45:26 +06:30 |
|
Aung Myo
|
eb001275c7
|
fixed conflict
|
2017-06-11 18:09:00 +06:30 |
|