Yan
|
c482318b1a
|
req bill bugs fixing
|
2017-06-06 16:37:42 +06:30 |
|
Nweni
|
b847cde62c
|
sale query updated
|
2017-06-06 14:03:21 +06:30 |
|
Nweni
|
eaec6a39b4
|
fixed conflict
|
2017-06-06 09:47:33 +06:30 |
|
Nweni
|
0cc378f318
|
fixed conflict
|
2017-06-06 09:43:16 +06:30 |
|
Yan
|
64f5dd65bd
|
merged settings_backend
|
2017-06-06 09:42:53 +06:30 |
|
Aung Myo
|
b54a19cfff
|
update query data for origami
|
2017-06-06 09:18:01 +06:30 |
|
PhyoTheingi
|
7b457400b2
|
Delete Fix for parent child process in Menu
|
2017-06-05 18:31:56 +06:30 |
|
Nweni
|
faca7295f7
|
added new image upload file
|
2017-06-05 17:14:07 +06:30 |
|
Aung Myo
|
68e51c98c3
|
update origamitable,room query
|
2017-06-05 15:07:44 +06:30 |
|
Yan
|
1dbe133b79
|
update for db changed
|
2017-06-05 13:28:40 +06:30 |
|
Yan
|
9b90e3bd7e
|
pulled master at 4
|
2017-06-04 18:29:58 +06:30 |
|
Yan
|
8d4086d5e9
|
oqs printing
|
2017-06-04 18:25:09 +06:30 |
|
Aung Myo
|
e309b35669
|
fixed conflictsale item order order item
|
2017-06-04 16:51:38 +06:30 |
|
Aung Myo
|
af02a63263
|
fixed conflict request_bill and order model
|
2017-06-04 16:25:25 +06:30 |
|
Aung Myo
|
9b334a20fa
|
fixed receipt bill print view
|
2017-06-04 16:13:15 +06:30 |
|
Cherry
|
e3f9d62bce
|
Sale Save
|
2017-06-04 16:02:55 +06:30 |
|
Nweni
|
db904739ac
|
setting update
|
2017-06-04 15:55:06 +06:30 |
|
Nweni
|
9624d4df3e
|
update
|
2017-06-04 15:47:03 +06:30 |
|
Nweni
|
aa295c3a12
|
fixed conflict
|
2017-06-04 13:12:02 +06:30 |
|
Nweni
|
fa34d1db8f
|
fixed conflict
|
2017-06-04 10:23:38 +06:30 |
|
PhyoTheingi
|
a01c4bd9cf
|
Menu Item instances and OQS json saving
|
2017-06-03 17:09:56 +06:30 |
|
Aung Myo
|
a2c9996b76
|
Finished Request Bill print function
|
2017-06-03 17:04:17 +06:30 |
|
Min Zeya Phyo
|
9dddd2fc78
|
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
|
2017-06-03 15:05:25 +06:30 |
|
Min Zeya Phyo
|
eab356233c
|
add new model - shop - it will be use to define what is setup
|
2017-06-03 15:04:53 +06:30 |
|
Aung Myo
|
138850fb24
|
origin pull master
|
2017-06-03 13:44:10 +06:30 |
|
Aung Myo
|
7529d23147
|
update booking status and view
|
2017-06-03 13:32:13 +06:30 |
|
Yan
|
aa36c679ab
|
oqs item count fixed
|
2017-06-03 13:25:23 +06:30 |
|
Yan
|
03ae60d2e6
|
merge all 03062017
|
2017-06-03 12:50:08 +06:30 |
|
PhyoTheingi
|
2716b913f2
|
Setting Instances Update
|
2017-06-03 11:59:29 +06:30 |
|
Aung Myo
|
2374fedca5
|
account show.html
|
2017-06-03 10:37:05 +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 |
|
Yan
|
3d05a91adf
|
Print ui update
|
2017-06-02 18:49:44 +06:30 |
|
Yan
|
63be238e09
|
uncomplete print, need for print_settings
|
2017-06-02 18:26:44 +06:30 |
|
Cherry
|
7146a1028a
|
update
|
2017-06-02 17:53:25 +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
|
840bb52365
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-02 14:48:11 +06:30 |
|
Yan
|
5d608b8a57
|
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-02 14:03:40 +06:30 |
|
Aung Myo
|
4e36cad341
|
update booking complete and cancle in crm
|
2017-06-02 14:02:54 +06:30 |
|
PhyoTheingi
|
f89a4237df
|
Menu Item Instance
|
2017-06-02 14:02:03 +06:30 |
|
Yan
|
4313032875
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-02 14:00:23 +06:30 |
|
Aung Myo
|
165317a536
|
update booking complete and cancle in crm
|
2017-06-02 13:59:45 +06:30 |
|
Yan
|
17206001c4
|
updated oqs ui
|
2017-06-02 13:58:35 +06:30 |
|
Aung Myo
|
ed6de14412
|
update booking controller in crm
|
2017-06-02 13:17:09 +06:30 |
|
PhyoTheingi
|
0c82c16293
|
Order Queue Station Bug Fix
|
2017-06-02 11:38:46 +06:30 |
|
Yan
|
95fd260c76
|
updated ui
|
2017-06-02 11:28:07 +06:30 |
|
Aung Myo
|
c9782bf84a
|
update booking with cancel and assign
|
2017-06-02 10:52:46 +06:30 |
|