Commit Graph

713 Commits

Author SHA1 Message Date
Zin Lin Phyo
4b97cd530e commission report export excel 2017-08-29 23:05:03 +06:30
Zin Lin Phyo
f03d8654e7 commission report 2017-08-29 18:36:46 +06:30
Zin Lin Phyo
63d97cce26 fix conflit 2017-08-28 18:22:32 +06:30
Zin Lin Phyo
1cbea173df product commission transaction in commissioner 2017-08-28 18:17:22 +06:30
yamin
0369cd6646 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-28 17:56:24 +06:30
yamin
81c928b375 InJutyUpdate 2017-08-28 17:55:47 +06:30
Zin Lin Phyo
36b4b15688 added commission report 2017-08-28 10:52:14 +06:30
Zin Lin Phyo
4fd4fdaeb7 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Dining Charges Bug Fix
  InJutyIndexform
2017-08-28 09:47:06 +06:30
Zin Lin Phyo
3131823ae0 commission update -> change route under settings 2017-08-28 09:46:36 +06:30
Yan
812a32a89f Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-25 18:57:06 +06:30
Phyo
a0fe336589 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-25 18:54:16 +06:30
Phyo
44105a5f3b Dining Charges Bug Fix 2017-08-25 18:52:35 +06:30
yamin
61817ce178 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-25 18:49:02 +06:30
yamin
57d668d122 InJutyIndexform 2017-08-25 18:48:34 +06:30
Zin Lin Phyo
ef9fe32b5b fix conflit 2017-08-25 13:46:50 +06:30
Zin Lin Phyo
b4eb27b8a9 commission in sale edit 2017-08-25 13:44:22 +06:30
yamin
29a5062b85 InJutiesUpdate 2017-08-25 13:06:25 +06:30
Yan
5aa8727f42 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-25 11:20:24 +06:30
Nweni
6aaea69f0a Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-25 09:41:44 +06:30
Nweni
b99c503afa inventory 2017-08-25 09:40:59 +06:30
Yan
836fa6cddb Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-24 18:33:21 +06:30
yamin
4791656a7d Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-24 18:26:28 +06:30
yamin
7004637027 In_juties 2017-08-24 18:24:57 +06:30
Yan
830370dac8 fix for missing item attributes in simple menu create 2017-08-24 18:16:14 +06:30
Nweni
1f7ba42e80 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-24 18:04:57 +06:30
Nweni
81f430b5c6 inventory setup 2017-08-24 18:04:42 +06:30
Yan
d1f5c94be8 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-24 15:28:56 +06:30
Phyo
9327cb7169 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-24 15:28:34 +06:30
Yan
412bfea5b3 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-24 15:21:46 +06:30
Phyo
0670a6a05d Promotion Product Bug Fix 2017-08-24 14:37:11 +06:30
Aung Myo
7b90acd2c1 update jade integration card use for all shop 2017-08-24 11:29:04 +06:30
Zin Lin Phyo
283c59c5dc Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Promotion Time Fixed
2017-08-24 10:08:56 +06:30
Zin Lin Phyo
f2ddcb9e4b readded commission 2017-08-24 10:05:07 +06:30
Yan
18dc0300c4 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-23 19:55:37 +06:30
Aung Myo
352037641b update jade integration 2017-08-23 19:55:17 +06:30
Yan
1a091929b0 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-23 19:51:55 +06:30
Aung Myo
07b13d8f87 update jade integration 2017-08-23 19:46:00 +06:30
Phyo
0118a178b2 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-23 19:18:18 +06:30
Phyo
857fcd419f Promotion Time Fixed 2017-08-23 19:09:44 +06:30
Yan
55f041a252 add checksum for menu sync 2017-08-23 18:59:23 +06:30
yamin
258ab711e1 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-23 18:15:36 +06:30
yamin
d88199150e CRUDIn_Juties 2017-08-23 18:14:31 +06:30
Nweni
44459ce4b5 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-23 17:37:47 +06:30
Nweni
de769f3faf promotion 2017-08-23 17:37:13 +06:30
Zin Lin Phyo
784da2cf09 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  UpdateCommissioner
2017-08-23 15:24:50 +06:30
Zin Lin Phyo
f205d9910e readded commissions_controller 2017-08-23 15:19:55 +06:30
yamin
111872c158 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-23 15:04:34 +06:30
yamin
621dfb03fe UpdateCommissioner 2017-08-23 15:03:53 +06:30
Zin Lin Phyo
874a9b60be create InJuty 2017-08-23 15:02:27 +06:30
Zin Lin Phyo
3132bc7c34 commission update 2017-08-23 11:14:24 +06:30