Commit Graph

  • 2ee08e943d for pull Zin Lin Phyo 2017-08-31 10:22:21 +06:30
  • 012b771435 Set Auto Generate ID to exact 16 Phyo 2017-08-31 10:07:44 +06:30
  • 65675a6683 Update Nweni 2017-08-31 09:22:40 +06:30
  • d1172dae0d inventory Nweni 2017-08-31 09:21:24 +06:30
  • f50ca87e59 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-30 19:16:20 +06:30
  • 51d8c986f1 merge with august_spring Yan 2017-08-30 19:16:07 +06:30
  • 3e8ead6a32 ui code review and edited Yan 2017-08-30 19:04:06 +06:30
  • 883f5f575a Promotion by Instance Phyo 2017-08-30 18:57:35 +06:30
  • 84d483cad2 update addorder Aung Myo 2017-08-30 18:41:54 +06:30
  • 2f0a7c11ad Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Phyo 2017-08-30 18:22:42 +06:30
  • bf9f0cdbe7 CRUD Update for Promotion Phyo 2017-08-30 18:22:22 +06:30
  • 5a0ca4b39d fix conflit Zin Lin Phyo 2017-08-30 15:58:06 +06:30
  • 675ebd56a7 assign in_juty in sale edit Zin Lin Phyo 2017-08-30 15:57:15 +06:30
  • bd00f16040 Update Nweni 2017-08-30 14:37:50 +06:30
  • de45fb29b8 Update Nweni 2017-08-30 14:21:05 +06:30
  • cabc78c373 inventory Nweni 2017-08-30 14:19:24 +06:30
  • c7018ee774 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-30 11:14:11 +06:30
  • bc84a384a5 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Zin Lin Phyo 2017-08-30 10:46:59 +06:30
  • df4caa288d jquery date-time picker Zin Lin Phyo 2017-08-30 10:46:46 +06:30
  • 15e37f9ee2 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Phyo 2017-08-30 09:20:47 +06:30
  • 2208b8a526 Promo Phrase 1 Phyo 2017-08-30 09:20:35 +06:30
  • 4b97cd530e commission report export excel Zin Lin Phyo 2017-08-29 23:05:03 +06:30
  • 76fb16615d merge with august sprint for commission Yan 2017-08-29 18:44:31 +06:30
  • 5fcfbdc020 fix conflit Zin Lin Phyo 2017-08-29 18:42:08 +06:30
  • f03d8654e7 commission report Zin Lin Phyo 2017-08-29 18:36:46 +06:30
  • 7c5db11df5 merge with addorder Yan 2017-08-29 18:08:05 +06:30
  • 901c6a786d update sync sql Yan 2017-08-29 18:06:09 +06:30
  • 2e48c1529e update addorder Aung Myo 2017-08-29 17:58:34 +06:30
  • a9b606730c fix for oqs print copy and update sym sql Yan 2017-08-29 14:44:07 +06:30
  • e87209093b date format for promotion and add sync sql Yan 2017-08-29 13:58:13 +06:30
  • e84c080552 DataetimepickerInJuty yamin 2017-08-29 13:20:32 +06:30
  • bbd9a50868 merge with august spring Yan 2017-08-28 18:33:49 +06:30
  • 6472a2deac Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-28 18:27:58 +06:30
  • 1372285c7f update add order Aung Myo 2017-08-28 18:27:22 +06:30
  • 63d97cce26 fix conflit Zin Lin Phyo 2017-08-28 18:22:32 +06:30
  • 1cbea173df product commission transaction in commissioner Zin Lin Phyo 2017-08-28 18:17:22 +06:30
  • 0369cd6646 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring yamin 2017-08-28 17:56:24 +06:30
  • 81c928b375 InJutyUpdate yamin 2017-08-28 17:55:47 +06:30
  • ace8794ac3 Merge branch 'master' into august_spring Phyo 2017-08-28 14:25:48 +06:30
  • 087c120cc7 tax bug fix Phyo 2017-08-28 14:24:53 +06:30
  • 8577754c0f add item instance code to order item Yan 2017-08-28 14:19:40 +06:30
  • 36b4b15688 added commission report Zin Lin Phyo 2017-08-28 10:52:14 +06:30
  • 4fd4fdaeb7 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Zin Lin Phyo 2017-08-28 09:47:06 +06:30
  • 3131823ae0 commission update -> change route under settings Zin Lin Phyo 2017-08-28 09:46:36 +06:30
  • c9998c0b65 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Nweni 2017-08-28 09:37:58 +06:30
  • 83ec17a3df inventory development Nweni 2017-08-28 09:37:36 +06:30
  • 812a32a89f Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-25 18:57:06 +06:30
  • 8b79cdef7b add doc in readme.md Yan 2017-08-25 18:56:46 +06:30
  • 2522950019 update create order function Aung Myo 2017-08-25 18:55:34 +06:30
  • a0fe336589 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Phyo 2017-08-25 18:54:16 +06:30
  • 44105a5f3b Dining Charges Bug Fix Phyo 2017-08-25 18:52:35 +06:30
  • 61817ce178 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring yamin 2017-08-25 18:49:02 +06:30
  • 57d668d122 InJutyIndexform yamin 2017-08-25 18:48:34 +06:30
  • ef9fe32b5b fix conflit Zin Lin Phyo 2017-08-25 13:46:50 +06:30
  • b4eb27b8a9 commission in sale edit Zin Lin Phyo 2017-08-25 13:44:22 +06:30
  • 29a5062b85 InJutiesUpdate yamin 2017-08-25 13:06:25 +06:30
  • 5aa8727f42 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-25 11:20:24 +06:30
  • 6aaea69f0a Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Nweni 2017-08-25 09:41:44 +06:30
  • b99c503afa inventory Nweni 2017-08-25 09:40:59 +06:30
  • 836fa6cddb Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-24 18:33:21 +06:30
  • d1f0356851 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Phyo 2017-08-24 18:32:14 +06:30
  • 8b33a94d93 Promotion Tax bug fix Phyo 2017-08-24 18:31:53 +06:30
  • 4791656a7d Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring yamin 2017-08-24 18:26:28 +06:30
  • 7004637027 In_juties yamin 2017-08-24 18:24:57 +06:30
  • 37b820a569 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-24 18:19:15 +06:30
  • fb7ddd947a update for check for menu item api Yan 2017-08-24 18:18:52 +06:30
  • 830370dac8 fix for missing item attributes in simple menu create Yan 2017-08-24 18:16:14 +06:30
  • a043a33ca5 update addorder Aung Myo 2017-08-24 18:10:23 +06:30
  • 1f7ba42e80 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Nweni 2017-08-24 18:04:57 +06:30
  • 81f430b5c6 inventory setup Nweni 2017-08-24 18:04:42 +06:30
  • d1f5c94be8 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-24 15:28:56 +06:30
  • 9327cb7169 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Phyo 2017-08-24 15:28:34 +06:30
  • 28f250c97f update seed for tasty osaka Yan 2017-08-24 15:26:46 +06:30
  • 412bfea5b3 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-24 15:21:46 +06:30
  • 0670a6a05d Promotion Product Bug Fix Phyo 2017-08-24 14:37:11 +06:30
  • 3314b3554f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder Aung Myo 2017-08-24 13:30:02 +06:30
  • d36a633134 fix menu item json format Yan 2017-08-24 12:48:10 +06:30
  • 7b90acd2c1 update jade integration card use for all shop Aung Myo 2017-08-24 11:29:04 +06:30
  • 283c59c5dc Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Zin Lin Phyo 2017-08-24 10:08:56 +06:30
  • f2ddcb9e4b readded commission Zin Lin Phyo 2017-08-24 10:05:07 +06:30
  • 18dc0300c4 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-23 19:55:37 +06:30
  • 352037641b update jade integration Aung Myo 2017-08-23 19:55:17 +06:30
  • 1a091929b0 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant Yan 2017-08-23 19:51:55 +06:30
  • 07b13d8f87 update jade integration Aung Myo 2017-08-23 19:46:00 +06:30
  • 0118a178b2 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Phyo 2017-08-23 19:18:18 +06:30
  • 857fcd419f Promotion Time Fixed Phyo 2017-08-23 19:09:44 +06:30
  • 55f041a252 add checksum for menu sync Yan 2017-08-23 18:59:23 +06:30
  • 258ab711e1 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring yamin 2017-08-23 18:15:36 +06:30
  • d88199150e CRUDIn_Juties yamin 2017-08-23 18:14:31 +06:30
  • 688ce932cc promotion Nweni 2017-08-23 18:07:58 +06:30
  • 44459ce4b5 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Nweni 2017-08-23 17:37:47 +06:30
  • de769f3faf promotion Nweni 2017-08-23 17:37:13 +06:30
  • 784da2cf09 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Zin Lin Phyo 2017-08-23 15:24:50 +06:30
  • f205d9910e readded commissions_controller Zin Lin Phyo 2017-08-23 15:19:55 +06:30
  • 111872c158 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring yamin 2017-08-23 15:04:34 +06:30
  • 621dfb03fe UpdateCommissioner yamin 2017-08-23 15:03:53 +06:30
  • d56132f6f4 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Zin Lin Phyo 2017-08-23 15:03:16 +06:30
  • 874a9b60be create InJuty Zin Lin Phyo 2017-08-23 15:02:27 +06:30
  • 790b7939fc Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring Phyo 2017-08-23 13:59:52 +06:30
  • 248b807633 Dining Charges Fix for free time Phyo 2017-08-23 13:59:27 +06:30