Commit Graph

  • d1765ca32c fix for oqs and add instance code to assign order item Yan 2017-11-15 16:19:44 +06:30
  • ef253cd1dc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Aung Myo 2017-11-15 13:40:35 +06:30
  • 308d9eefde update booking search Aung Myo 2017-11-15 13:40:09 +06:30
  • 71a4b9b7e3 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-15 13:28:46 +06:30
  • 37b509474f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-15 13:28:18 +06:30
  • 9647a28f91 dashboard chart UI phyusin 2017-11-15 13:27:42 +06:30
  • e263ba2433 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-15 12:06:55 +06:30
  • b8dc74f517 merge with license but not complete Yan 2017-11-15 12:06:06 +06:30
  • 1c0a93d56d update pagination and booking and rebate redeem Aung Myo 2017-11-15 12:02:02 +06:30
  • 12f75ff403 licensing Yan 2017-11-15 12:01:49 +06:30
  • 7c6153f16f licensing Yan 2017-11-15 12:01:35 +06:30
  • de3f2e5e90 clear buttom in datepickere Aung Myo 2017-11-15 09:44:52 +06:30
  • 5ec45593de licensing Yan 2017-11-14 18:35:25 +06:30
  • 93769bacb7 licensing Yan 2017-11-14 18:35:14 +06:30
  • 28dbb75774 update rebate and update api Aung Myo 2017-11-14 18:30:57 +06:30
  • 222114a3c3 licensing Yan 2017-11-14 16:06:17 +06:30
  • 36275b55c6 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-14 15:54:17 +06:30
  • f927d99807 update transaction Aung Myo 2017-11-14 15:48:22 +06:30
  • 937576856f update back buttom in cashier default Aung Myo 2017-11-14 15:33:06 +06:30
  • abb8838215 licensing Yan 2017-11-14 15:31:18 +06:30
  • 683982d4f5 adding license Yan 2017-11-14 15:11:16 +06:30
  • 54f68bdfc5 remove byebun in license rb Yan 2017-11-14 13:46:24 +06:30
  • 6f06e7a9d7 add booking list in transaction Aung Myo 2017-11-14 13:42:00 +06:30
  • fa7cb53e55 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-14 13:08:22 +06:30
  • f1a28d64e1 update OQS and cashier Aung Myo 2017-11-14 09:43:13 +06:30
  • 69fb7fa551 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-14 09:42:55 +06:30
  • a6252923f1 test license Yan 2017-11-10 19:03:10 +06:30
  • e4308cdc53 license test remove Yan 2017-11-10 18:10:19 +06:30
  • 97fd7619ce license test Yan 2017-11-10 18:08:48 +06:30
  • 4ad65c5480 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-10 14:35:05 +06:30
  • 3a71b86695 add license and encryption for cloud Yan 2017-11-10 14:34:46 +06:30
  • 8db96beca0 update oqs view an d promotion form update Aung Myo 2017-11-10 14:32:21 +06:30
  • 4ce8fe48bc license for master Yan 2017-11-10 14:15:05 +06:30
  • a70f9a43e6 license Yan 2017-11-10 14:11:10 +06:30
  • fb64041a3f Merge branch 'master' into license Yan 2017-11-10 11:30:05 +06:30
  • b82099368f fix edit dining charges Yan 2017-11-10 11:29:45 +06:30
  • e5f1a44551 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-09 18:31:16 +06:30
  • 9c50e1486f activation form Yan 2017-11-09 18:30:33 +06:30
  • 053a8dbf8a activation form Yan 2017-11-09 18:30:20 +06:30
  • 7115ae0a97 update gem clean force Aung Myo 2017-11-09 18:09:18 +06:30
  • f8cd712ad1 update feedback testing Aung Myo 2017-11-09 17:25:54 +06:30
  • 02f3c0d253 license Yan 2017-11-09 15:49:29 +06:30
  • 09dcbaf9f2 license and AES Yan 2017-11-09 15:47:16 +06:30
  • 310ba78ef5 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-09 14:42:18 +06:30
  • 99cfc19392 add AES key Yan 2017-11-09 14:41:56 +06:30
  • 121338677c add license Yan 2017-11-09 14:41:35 +06:30
  • cb91ad307a update shop form Aung Myo 2017-11-09 14:40:15 +06:30
  • eba30f6566 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-09 12:04:32 +06:30
  • 0813cb5722 update design pages Aung Myo 2017-11-09 12:01:22 +06:30
  • 66ae94c3e2 fix dining charges for room Yan 2017-11-09 11:51:49 +06:30
  • 845adf7d19 install form Yan 2017-11-09 10:56:03 +06:30
  • 96635688a3 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-08 18:56:27 +06:30
  • a5d2b3b32b fix dining time Yan 2017-11-08 18:56:03 +06:30
  • 60eb21a5eb update desing pages Aung Myo 2017-11-08 18:13:57 +06:30
  • 99222a3f70 update desing pages Aung Myo 2017-11-08 18:06:26 +06:30
  • f7fa92e6bc Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-08 17:17:41 +06:30
  • 7fe1ff5b22 update payment page Aung Myo 2017-11-08 17:14:18 +06:30
  • d928deaa2f fix dining and change price for total price not (qty*unit_price) for sale item in bill Yan 2017-11-08 17:12:36 +06:30
  • 482d0559eb update login dashoborad Aung Myo 2017-11-08 11:09:53 +06:30
  • bfadacd950 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Aung Myo 2017-11-08 09:32:25 +06:30
  • 6dd0faee10 change ui for delete backend Yan 2017-11-07 20:00:51 +06:30
  • 9f09079b94 turbolink fixing Yan 2017-11-07 18:52:09 +06:30
  • 6596c90f02 turbolink fixing Yan 2017-11-07 18:51:59 +06:30
  • dcf4c6125a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Aung Myo 2017-11-07 18:16:01 +06:30
  • 2756cf2987 update survey json Aung Myo 2017-11-07 17:32:24 +06:30
  • 8aa834a487 delete btn for menu item instance Yan 2017-11-07 17:31:14 +06:30
  • f7ef431ded Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-07 15:29:28 +06:30
  • 21498fc714 update seed Yan 2017-11-07 15:27:48 +06:30
  • 55943a2e33 update survey json Aung Myo 2017-11-07 15:19:22 +06:30
  • 4db7f7b7aa add survey form Yan 2017-11-07 15:06:27 +06:30
  • 7dd4bc87e4 update seed Yan 2017-11-07 15:01:25 +06:30
  • 75118ef88b update survey Aung Myo 2017-11-07 14:53:46 +06:30
  • 97c03c1744 update survey Aung Myo 2017-11-07 14:49:42 +06:30
  • 758b36000e origami numpad ui fix and promotion fix Yan 2017-11-07 14:48:33 +06:30
  • 7b2f928df0 test for jade Yan 2017-11-07 12:32:50 +06:30
  • 0ad958d8a8 del migrating no need commission Yan 2017-11-07 11:03:19 +06:30
  • 17afb039cb update commission Yan 2017-11-07 10:52:57 +06:30
  • 4fa0705f1c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-07 10:32:48 +06:30
  • b48625e25e update commission and seed for font Aung Myo 2017-11-07 10:31:10 +06:30
  • 8f69caff2d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-07 10:29:27 +06:30
  • c5e6854faa change UI for payment page in origami phyusin 2017-11-07 10:28:20 +06:30
  • 6917ce2612 add survey Yan 2017-11-06 18:51:15 +06:30
  • 396baee19c merge with aung myo Yan 2017-11-06 18:24:47 +06:30
  • d5efe1402f add survey Yan 2017-11-06 18:23:38 +06:30
  • 70a908158f fix for checkbox in promotion and Back btn fix for Customers in Origami phyusin 2017-11-06 16:02:01 +06:30
  • 3aacc63b82 update conflix sarb rb Aung Myo 2017-11-06 14:17:47 +06:30
  • 7e19dbc1b6 merge with aung myo Yan 2017-11-06 13:45:26 +06:30
  • 2e0b2b823a redis 4 to 3 Yan 2017-11-06 13:44:21 +06:30
  • ce49f81440 update update void print and sale item report Aung Myo 2017-11-06 13:42:04 +06:30
  • 6a8bf490d8 fix sale item report and bill print Yan 2017-11-06 12:33:41 +06:30
  • 8f13403fab update transaction Aung Myo 2017-11-06 09:45:44 +06:30
  • d4e73a18d1 sale receipt no Yan 2017-11-04 15:00:18 +06:30
  • 15196053a0 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-01 17:14:44 +06:30
  • 17fb38158b ui update Yan 2017-11-01 17:14:24 +06:30
  • ff9df58b6e bundle update Yan 2017-11-01 16:54:38 +06:30
  • 4ad355bacb update gem file Yan 2017-11-01 16:35:19 +06:30
  • ebb2114243 update payment method report and from,to time change Aung Myo 2017-11-01 16:14:45 +06:30
  • bb668e1070 fix ui Yan 2017-11-01 15:48:32 +06:30
  • a569e9b5a2 add is_currently_login true in clear data Yan 2017-11-01 10:11:41 +06:30
  • 6fe447c7f3 upgrade Yan 2017-10-31 18:55:16 +06:30