Commit Graph

668 Commits

Author SHA1 Message Date
yamin
1aea52619a UI change 2017-10-23 11:38:10 +06:30
Yan
7ab62e2a24 re-origin seed generate 2017-10-19 17:12:02 +06:30
Yan
a00c2d5922 while loop for race condition in seed generate 2017-10-19 17:09:34 +06:30
Yan
2f3e6cb9aa not done 2017-10-17 18:08:45 +06:30
Yan
a7ad3e2476 change oqs print 2017-10-16 18:30:59 +06:30
Yan
cbefe0f7d8 check oqs print 2017-10-16 15:28:56 +06:30
Yan
70c56b245e instance in sale item report 2017-10-16 13:41:37 +06:30
Yan
de1469bd5e Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-12 10:16:00 +06:30
Aung Myo
60b5a17388 update product in product rb 2017-10-11 10:15:10 +06:30
Aung Myo
50756656a7 updat e addorder for product add 2017-10-10 18:05:09 +06:30
Yan
c70b2dcb19 provision setup 2017-10-09 15:54:24 +06:30
Yan
7ebd874c56 merge with chart 2017-10-09 10:51:17 +06:30
Aung Myo
35b9a9e02a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs 2017-09-27 11:26:27 +06:30
Aung Myo
ddf466d3fe update addorder available and max qty 2017-09-27 11:26:13 +06:30
yamin
a53a5a39b1 dashboard chart data 2017-09-22 10:34:14 +06:30
Yan
f4270ffd87 fix promotion date format 2017-09-18 17:36:17 +06:30
Aung Myo
e878a6387e update member discount 2017-09-14 17:36:00 +06:30
Yan
c131a4eff2 fix dining charge calc 2017-09-11 15:47:32 +06:30
Yan
ea02f6b8fc Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-09-11 14:05:35 +06:30
Yan
efb60e6f79 add calc tax order in sale 2017-09-11 14:05:19 +06:30
Phyo
fa7fcdd559 Room Charges(Account ID change,add dropdown list,tac not calculate) 2017-09-11 13:55:38 +06:30
Yan
10bd525d02 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into master-bug-fix 2017-09-08 13:50:55 +06:30
Phyo
69c52bf28b Dininng Charges Free time Count Change 2017-09-08 13:45:52 +06:30
Phyo
e7f1964a78 Promotion over two promotion products 2017-09-08 11:38:34 +06:30
Yan
3d7295c081 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-09-07 15:37:12 +06:30
Zin Lin Phyo
43cc308d89 stock check report 2017-09-07 10:30:20 +06:30
Yan
a50becb365 merge with august_spring 2017-09-06 18:32:45 +06:30
Zin Lin Phyo
2e53b72574 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Timepicker Bug Fix
  Show data in Edit
  Promotion Destory Bug Fix
2017-09-06 18:28:09 +06:30
Zin Lin Phyo
5e1e0cd5b9 stock_check report template 2017-09-06 18:27:58 +06:30
Phyo
4ca3b708c4 Show data in Edit 2017-09-06 17:01:33 +06:30
Zin Lin Phyo
784e740da3 rename in_juty to in_duty 2017-09-06 11:18:02 +06:30
Yan
995ee8298e Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant 2017-09-05 14:14:10 +06:30
Yan
3dc7fea339 date format fix for promotion 2017-09-05 14:12:53 +06:30
Aung Myo
eeb2a91ce9 update oqs action cable for order cahnnel and oqs channel 2017-09-05 09:41:05 +06:30
Yan
a4884c9bea item instance code add to sale_item 2017-09-04 15:10:26 +06:30
Yan
82120e2ba1 updated commission for sale edit 2017-09-04 13:13:08 +06:30
Zin Lin Phyo
2330a1a33e calculate commission in sale_edit, void, foc 2017-09-04 12:09:04 +06:30
Zin Lin Phyo
c2d86cb17c Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Promotion multiple order
2017-09-04 10:24:54 +06:30
Zin Lin Phyo
98dae6d712 show and update changes in commission and report 2017-09-04 10:24:24 +06:30
Phyo
2eaf891748 Promotion multiple order 2017-09-04 10:22:54 +06:30
Yan
e09559c508 merge with august spring but merge fail 2017-08-31 15:58:01 +06:30
Nweni
12c8be597d Inventory Stock Check Print 2017-08-31 15:29:36 +06:30
Yan
2399f1d494 update form attr name to attr id to instances 2017-08-31 11:41:38 +06:30
Yan
51d8c986f1 merge with august_spring 2017-08-30 19:16:07 +06:30
Phyo
883f5f575a Promotion by Instance 2017-08-30 18:57:35 +06:30
Phyo
2f0a7c11ad Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-30 18:22:42 +06:30
Phyo
bf9f0cdbe7 CRUD Update for Promotion 2017-08-30 18:22:22 +06:30
Nweni
de45fb29b8 Update 2017-08-30 14:21:05 +06:30
Nweni
cabc78c373 inventory 2017-08-30 14:19:24 +06:30
Yan
c7018ee774 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-30 11:14:11 +06:30