Commit Graph

551 Commits

Author SHA1 Message Date
Zin Lin Phyo
6c94ba5457 in_juty ui update 2017-09-04 14:47:58 +06:30
Yan
82120e2ba1 updated commission for sale edit 2017-09-04 13:13:08 +06:30
Zin Lin Phyo
98dae6d712 show and update changes in commission and report 2017-09-04 10:24:24 +06:30
Yan
3726e8a7c3 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-31 18:09:35 +06:30
Zin Lin Phyo
d1003e2f6a move load_commissioner to origamin/product_commission 2017-08-31 14:15:09 +06:30
Yan
2b3c294327 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-31 12:10:31 +06:30
Aung Myo
449969fa5b update addorder 2017-08-31 11:22:12 +06:30
Yan
f50ca87e59 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-30 19:16:20 +06:30
Yan
51d8c986f1 merge with august_spring 2017-08-30 19:16:07 +06:30
Yan
3e8ead6a32 ui code review and edited 2017-08-30 19:04:06 +06:30
Aung Myo
84d483cad2 update addorder 2017-08-30 18:41:54 +06:30
Zin Lin Phyo
675ebd56a7 assign in_juty in sale edit 2017-08-30 15:57:15 +06:30
Yan
c7018ee774 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-30 11:14:11 +06:30
Zin Lin Phyo
df4caa288d jquery date-time picker 2017-08-30 10:46:46 +06:30
Yan
76fb16615d merge with august sprint for commission 2017-08-29 18:44:31 +06:30
Yan
7c5db11df5 merge with addorder 2017-08-29 18:08:05 +06:30
Aung Myo
2e48c1529e update addorder 2017-08-29 17:58:34 +06:30
yamin
e84c080552 DataetimepickerInJuty 2017-08-29 13:20:32 +06:30
Yan
bbd9a50868 merge with august spring 2017-08-28 18:33:49 +06:30
Yan
6472a2deac Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-28 18:27:58 +06:30
Aung Myo
1372285c7f update add order 2017-08-28 18:27:22 +06:30
Zin Lin Phyo
63d97cce26 fix conflit 2017-08-28 18:22:32 +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
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
Aung Myo
2522950019 update create order function 2017-08-25 18:55:34 +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
836fa6cddb Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-24 18:33:21 +06:30
yamin
7004637027 In_juties 2017-08-24 18:24:57 +06:30
Yan
37b820a569 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-24 18:19:15 +06:30
Aung Myo
a043a33ca5 update addorder 2017-08-24 18:10:23 +06:30
Yan
d1f5c94be8 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-24 15:28:56 +06:30
Yan
412bfea5b3 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-24 15:21:46 +06:30
Aung Myo
3314b3554f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder 2017-08-24 13:30:02 +06:30
Aung Myo
7b90acd2c1 update jade integration card use for all shop 2017-08-24 11:29:04 +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
Aung Myo
07b13d8f87 update jade integration 2017-08-23 19:46:00 +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
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