77 Commits

Author SHA1 Message Date
Thein Lin Kyaw
e0cbe57245 Merge branch 'r-1902001-01' into foodcourt 2020-08-26 11:03:03 +06:30
Thein Lin Kyaw
5dfdc7353e print settings ActionCable 2020-08-18 16:11:17 +06:30
Thein Lin Kyaw
2ee1fc2423 Merge branch 'r-1902001-01' into foodcourt 2020-07-11 04:00:55 +06:30
Thein Lin Kyaw
7e9b4f7120 update license 2020-06-19 10:46:52 +06:30
yarzar_code
62fb440850 Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01 2020-06-08 15:48:13 +06:30
Zin Moe
bd18958b96 license renew page 2020-06-04 10:10:04 +06:30
yarzar_code
7a09ed0108 Menu Item Groups 2020-01-30 11:57:28 +06:30
Zin Moe
bca6fabaaf fix cashier page height & breadcrumb helper 2020-01-27 16:30:58 +06:30
Nweni
a0b7557f06 fixed conflict after merge with dev branch for report query updated 2019-11-27 14:09:16 +06:30
Thein Lin Kyaw
3c1cc737b5 improve receipt/details reports and implement number formatting
1) eager load reports for receipt/details
2) introduce number_format lookups to replace print_settings for number formatting
3) implement NumberFormattable concern, reference number_format lookups or print_settings if not exist, to get number format settings and number formatting
4) replace rails NumberHelper.number_with_precision with NumberFormattable.number_format hopefully to reduce overhead, formatting numbers for huge lists of data
2019-11-25 23:17:53 +06:30
Nweni
54ab9e0ca5 shops 2019-11-18 12:22:31 +06:30
Myat Zin Wai Maw
047f2941cb added induties 2019-06-17 17:45:21 +06:30
Moe Su
aa8e795d45 Topup payment 2018-03-16 17:50:45 +06:30
phyusin
adefd8c034 remove conflict data 2018-02-27 14:35:21 +06:30
phyusin
7c171057d1 product sale 2018-02-23 14:03:25 +06:30
phyusin
48ce8e4809 split bill 2018-02-01 18:12:59 +06:30
phyusin
bb2c8694a5 add unionpay process for payment 2018-01-11 16:08:17 +06:30
phyusin
903dddd8cc CB ECR Integration 2018-01-10 18:08:28 +06:30
Yan
121338677c add license 2017-11-09 14:41:35 +06:30
Yan
d5efe1402f add survey 2017-11-06 18:23:38 +06:30
yamin
1aea52619a UI change 2017-10-23 11:38:10 +06:30
Zin Lin Phyo
784e740da3 rename in_juty to in_duty 2017-09-06 11:18:02 +06:30
Nweni
b99c503afa inventory 2017-08-25 09:40:59 +06:30
Nweni
81f430b5c6 inventory setup 2017-08-24 18:04:42 +06:30
Zin Lin Phyo
874a9b60be create InJuty 2017-08-23 15:02:27 +06:30
Zin Lin Phyo
74c2955ef0 create productCommission 2017-08-22 11:08:49 +06:30
Zin Lin Phyo
618f5f3b7c commssions 2017-08-21 16:11:51 +06:30
Zin Lin Phyo
2a736cc92f Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant: (71 commits)
  Update
  Coupon / Voucher data change
  update menu_sync
  update addorder
  update addorder view
  add fields for Menu Sync
  update add oreder
  add menu api
  update add order and calculate subtotal
  update seed
  menu ui update
  update ability for setmenu
  fixed
  update show for foc
  add bootstrap file input and menu item img implemented
  update foc and pdf
  update menu item
  update receipt bill pdf for foc and credit
  add CarrierWave gems for menu image upload
  add CarrierWave gems for menu image upload
  ...
2017-08-21 13:30:28 +06:30
Zin Lin Phyo
7b0db433c4 commissioner scaffold 2017-08-21 13:30:04 +06:30
Yan
a1df5a0dbc update menu_sync 2017-08-18 19:46:43 +06:30
Yan
3160aab399 merge with addorder 2017-08-17 18:59:22 +06:30
Yan
f2829fab0f Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-17 13:50:24 +06:30
Aung Myo
865c2c5cdd update add order 2017-08-17 09:54:19 +06:30
Phyo
fc2927b341 Promotion CRUD 2017-08-16 18:36:23 +06:30
Aung Myo
997cc0733c add item set and menu item set CRUD 2017-08-14 17:57:55 +06:30
Yan
edb4ab0425 Merge branch 'master' into menu_sync 2017-08-14 15:34:19 +06:30
Yan
03a6208a76 add item set with scaffold 2017-08-11 17:41:10 +06:30
Nweni
b0ad2049c5 dining_charges 2017-08-11 13:34:30 +06:30
Aung Myo
c93b50d46a update conflict oragimi.scss 2017-07-26 10:04:49 +06:30
Yan
bf9b977cd0 membership update 2017-07-24 19:24:43 +06:30
Aung Myo
2d55ea0dab update add order 2017-07-07 09:56:18 +06:30
Aung Myo
1d08954a76 update shift sale 2017-06-30 13:32:56 +06:30
Aung Myo
ab7f08b1d6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-28 12:47:18 +06:30
Min Zeya Phyo
ee651763b7 shift close and payment journal 2017-06-28 10:34:42 +06:30
Aung Myo
53ff3989b5 update merge cancan 2017-06-27 16:55:56 +06:30
Aung Myo
f762664912 update bill 2017-06-27 14:16:48 +06:30
Aung Myo
4c13be257b update authroize 2017-06-26 22:45:34 +06:30
Min Zeya Phyo
1ea9125f80 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
# Conflicts:
#	Gemfile.lock
#	app/views/layouts/application.html.erb
2017-06-26 21:57:55 +06:30
Min Zeya Phyo
b607154037 New Login form 2017-06-26 21:56:13 +06:30
Aung Myo
01e5b7ba6c update authorize 2017-06-23 09:41:48 +06:30