superuser
|
2fe8f77bac
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-16 09:43:05 +06:30 |
|
Yan
|
03feae5b0f
|
fix get_order_items_details method in order_item and add taxes in receipt
|
2017-06-15 17:57:58 +06:30 |
|
Yan
|
77049176f6
|
oqs and zone for seed
|
2017-06-15 16:47:04 +06:30 |
|
superuser
|
37dd8c9e5a
|
before pull
|
2017-06-15 14:07:54 +06:30 |
|
Aung Myo
|
71c3b2f451
|
update tether
|
2017-06-15 14:06:26 +06:30 |
|
Yan
|
061c06b3c3
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 11:25:49 +06:30 |
|
Yan
|
cca890ffdd
|
disable auto reload origami
|
2017-06-15 11:25:13 +06:30 |
|
Phyo
|
a600838c50
|
Bug Fix with Production
|
2017-06-15 11:05:13 +06:30 |
|
Yan
|
8cfa2bc5c5
|
payment bill added and origami bug fixed
|
2017-06-14 19:41:32 +06:30 |
|
Yan
|
dd9863025f
|
prepare for payment bill
|
2017-06-14 18:15:01 +06:30 |
|
Yan
|
ac7d99362d
|
Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-14 16:52:54 +06:30 |
|
Yan
|
41e9aec389
|
add cashier in sale and origami ui updated
|
2017-06-14 16:51:25 +06:30 |
|
Aung Myo
|
1963acbec0
|
Merge branch 'crm'
|
2017-06-14 15:59:19 +06:30 |
|
Yan
|
7d6414cce6
|
auto reload page for oqs 5sec and origami 10sec
|
2017-06-14 15:59:08 +06:30 |
|
Aung Myo
|
914069e3af
|
update customer and sale
|
2017-06-14 15:58:41 +06:30 |
|
Yan
|
b4021a87c8
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into pre_master
|
2017-06-14 10:16:55 +06:30 |
|
Yan
|
b7f1a0a029
|
print format updating
|
2017-06-14 10:15:35 +06:30 |
|
Nweni
|
a16af5e404
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-14 10:07:48 +06:30 |
|
Nweni
|
7d5d23e5a6
|
Update
|
2017-06-14 10:07:31 +06:30 |
|
Aung Myo
|
871c37f04e
|
update search
|
2017-06-14 00:11:03 +06:30 |
|
Aung Myo
|
3db6252304
|
update search and crm
|
2017-06-14 00:09:54 +06:30 |
|
Aung Myo
|
7f7d579d2f
|
add auth token:
exit
|
2017-06-13 18:28:22 +06:30 |
|
Yan
|
b133129389
|
merge with crm
|
2017-06-13 15:19:01 +06:30 |
|
Aung Myo
|
e5c29f6074
|
merge with report
|
2017-06-13 15:07:29 +06:30 |
|
Yan
|
d54fd19d1c
|
report ui format
|
2017-06-13 14:59:00 +06:30 |
|
Aung Myo
|
b513aa22ab
|
datepicker
|
2017-06-13 12:27:45 +06:30 |
|
Aung Myo
|
6717becf92
|
Customer Update
|
2017-06-13 11:35:30 +06:30 |
|
Aung Myo
|
f8df5147a4
|
fixed conflict file
|
2017-06-13 10:40:49 +06:30 |
|
Aung Myo
|
c05a64bae7
|
update customer amount
|
2017-06-13 10:36:40 +06:30 |
|
Yan
|
8fc4fa5cf1
|
order quries update
|
2017-06-12 20:14:20 +06:30 |
|
Yan
|
1d1a913732
|
bug fix for order completed
|
2017-06-12 20:11:37 +06:30 |
|
Aung Myo
|
7dcc777668
|
fixed conflict
|
2017-06-12 18:34:41 +06:30 |
|
Cherry
|
a35dad8872
|
Merge branch 'master' of https://bitbucket.org/code2lab/sxrestaurant
|
2017-06-12 18:28:18 +06:30 |
|
Cherry
|
a247c142b8
|
ReceiptList Report Rough
|
2017-06-12 18:26:00 +06:30 |
|
Yan
|
1d667c6174
|
merge with master
|
2017-06-12 18:24:57 +06:30 |
|
Aung Myo
|
b14f4d67a5
|
origamijs
|
2017-06-12 18:23:12 +06:30 |
|
Yan
|
423776cadd
|
print format update
|
2017-06-12 18:19:30 +06:30 |
|
Nweni
|
ddf85905ef
|
fixed conflict
|
2017-06-12 17:32:38 +06:30 |
|
Nweni
|
d1ae734f50
|
update
|
2017-06-12 17:30:49 +06:30 |
|
Aung Myo
|
622aa4f121
|
update origami js and index
|
2017-06-12 15:39:38 +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
|
4212ad45b3
|
updated for food and beverage bugs
|
2017-06-12 14:11:13 +06:30 |
|
Yan
|
c5e9d7afd5
|
merge with crm
|
2017-06-12 10:25:07 +06:30 |
|
Yan
|
121fb92b9b
|
update orgami js
|
2017-06-12 10:12:55 +06:30 |
|
Yan
|
09f9a29cde
|
merge with master
|
2017-06-12 10:01:36 +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 |
|
Aung Myo
|
d65882ac5b
|
crm update
|
2017-06-11 18:00:34 +06:30 |
|