Commit Graph

1449 Commits

Author SHA1 Message Date
Aung Myo
2be93e413d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs 2017-08-31 13:48:24 +06:30
Aung Myo
122c4b72fd updat 2017-08-31 13:47:55 +06:30
Yan
2b3c294327 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-31 12:10:31 +06:30
Yan
2399f1d494 update form attr name to attr id to instances 2017-08-31 11:41:38 +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
Phyo
883f5f575a Promotion by Instance 2017-08-30 18:57:35 +06:30
Aung Myo
84d483cad2 update addorder 2017-08-30 18:41:54 +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
Zin Lin Phyo
5a0ca4b39d fix conflit 2017-08-30 15:58:06 +06:30
Zin Lin Phyo
675ebd56a7 assign in_juty in sale edit 2017-08-30 15:57:15 +06:30
Nweni
bd00f16040 Update 2017-08-30 14:37:50 +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
Zin Lin Phyo
bc84a384a5 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Promo Phrase 1
2017-08-30 10:46:59 +06:30
Zin Lin Phyo
df4caa288d jquery date-time picker 2017-08-30 10:46:46 +06:30
Phyo
15e37f9ee2 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-30 09:20:47 +06:30
Phyo
2208b8a526 Promo Phrase 1 2017-08-30 09:20:35 +06:30
Zin Lin Phyo
4b97cd530e commission report export excel 2017-08-29 23:05:03 +06:30
Yan
76fb16615d merge with august sprint for commission 2017-08-29 18:44:31 +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
Yan
7c5db11df5 merge with addorder 2017-08-29 18:08:05 +06:30
Yan
901c6a786d update sync sql 2017-08-29 18:06:09 +06:30
Aung Myo
2e48c1529e update addorder 2017-08-29 17:58:34 +06:30
Yan
a9b606730c fix for oqs print copy and update sym sql 2017-08-29 14:44:07 +06:30
Yan
e87209093b date format for promotion and add sync sql 2017-08-29 13:58:13 +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
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
Nweni
c9998c0b65 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-28 09:37:58 +06:30
Nweni
83ec17a3df inventory development 2017-08-28 09:37: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
Aung Myo
2522950019 update create order function 2017-08-25 18:55:34 +06:30