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
|
f5b6445a21
|
update
|
2017-06-04 14:46:00 +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 |
|
Aung Myo
|
138850fb24
|
origin pull master
|
2017-06-03 13:44:10 +06:30 |
|
Yan
|
622ca05c9e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-03 13:27:11 +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 |
|
Yan
|
2e2bda168c
|
print developing
|
2017-06-03 12:41:24 +06:30 |
|
PhyoTheingi
|
2716b913f2
|
Setting Instances Update
|
2017-06-03 11:59:29 +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
|
90ca4651aa
|
add print controller
|
2017-06-02 18:50:21 +06:30 |
|
Yan
|
63be238e09
|
uncomplete print, need for print_settings
|
2017-06-02 18:26:44 +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 |
|
Yan
|
7d5e5e7129
|
update menu item instance
|
2017-06-02 14:47:34 +06:30 |
|
Yan
|
5d608b8a57
|
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-02 14:03:40 +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 |
|
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 |
|
Nweni
|
a9259ca845
|
order
|
2017-06-02 11:30:10 +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 |
|
PhyoTheingi
|
0fa9cd0cac
|
Sub Menu Item Showing
|
2017-06-02 09:50:48 +06:30 |
|
Aung Myo
|
acbd8acf04
|
Append Order Detail view finished
|
2017-06-01 18:47:08 +06:30 |
|
PhyoTheingi
|
7020d4957a
|
constraint to min_qty
|
2017-06-01 18:44:30 +06:30 |
|
Yan
|
f28f0bf292
|
UI updated
|
2017-06-01 18:37:15 +06:30 |
|
Nweni
|
926c54c079
|
Merge branch 'settings_backend'
|
2017-06-01 17:14:57 +06:30 |
|
PhyoTheingi
|
a7d7260157
|
Bug Fix
|
2017-06-01 14:00:08 +06:30 |
|
Yan
|
356923a9d8
|
pull master
|
2017-06-01 12:11:23 +06:30 |
|
Yan
|
2d511cc63e
|
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-01 10:09:22 +06:30 |
|
Yan
|
6b2a496830
|
merged origami
|
2017-06-01 10:08:55 +06:30 |
|
PhyoTheingi
|
03bf799708
|
Set_item Create
|
2017-06-01 10:03:07 +06:30 |
|
Yan
|
82d7d7ffcc
|
merge crm
|
2017-06-01 09:59:43 +06:30 |
|
Cherry
|
47469cf466
|
Origami update commit
|
2017-06-01 09:27:37 +06:30 |
|
Yan
|
5a564abca9
|
oqs sample
|
2017-05-31 22:14:46 +06:30 |
|
PhyoTheingi
|
a67c76d945
|
Menu 2nd Phrase
|
2017-05-31 18:27:31 +06:30 |
|
Aung Myo
|
f036274f5e
|
finished order tab view and customer tab
|
2017-05-31 18:19:51 +06:30 |
|