Commit Graph

1416 Commits

Author SHA1 Message Date
Zin Lin Phyo
df4caa288d jquery date-time picker 2017-08-30 10:46:46 +06:30
Zin Lin Phyo
4b97cd530e commission report export excel 2017-08-29 23:05:03 +06:30
Zin Lin Phyo
5fcfbdc020 fix conflit 2017-08-29 18:42:08 +06:30
Zin Lin Phyo
f03d8654e7 commission report 2017-08-29 18:36:46 +06:30
yamin
e84c080552 DataetimepickerInJuty 2017-08-29 13:20:32 +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
Phyo
ace8794ac3 Merge branch 'master' into august_spring 2017-08-28 14:25:48 +06:30
Phyo
087c120cc7 tax bug fix 2017-08-28 14:24:53 +06:30
Yan
8577754c0f add item instance code to order item 2017-08-28 14:19:40 +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
Yan
8b79cdef7b add doc in readme.md 2017-08-25 18:56:46 +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
Phyo
d1f0356851 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-24 18:32:14 +06:30
Phyo
8b33a94d93 Promotion Tax bug fix 2017-08-24 18:31:53 +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
37b820a569 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-24 18:19:15 +06:30
Yan
fb7ddd947a update for check for menu item api 2017-08-24 18:18:52 +06:30
Yan
830370dac8 fix for missing item attributes in simple menu create 2017-08-24 18:16:14 +06:30
Aung Myo
a043a33ca5 update addorder 2017-08-24 18:10:23 +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
28f250c97f update seed for tasty osaka 2017-08-24 15:26:46 +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
3314b3554f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder 2017-08-24 13:30:02 +06:30
Yan
d36a633134 fix menu item json format 2017-08-24 12:48:10 +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