Commit Graph

2771 Commits

Author SHA1 Message Date
Myat Zin Wai Maw
cd9756d061 Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt 2019-12-17 13:50:10 +06:30
Myat Zin Wai Maw
4d0f13106d foodcourt 2019-12-17 13:49:15 +06:30
NyanLinHtut
6568c09135 fixed out of stock 2019-12-16 11:32:51 +06:30
Myat Zin Wai Maw
949835ffdc Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt 2019-12-13 10:12:45 +06:30
Myat Zin Wai Maw
f45849de49 shop 2019-12-13 10:12:08 +06:30
NyanLinHtut
afe3c995ae fixed conflit 2019-12-13 10:09:25 +06:30
NyanLinHtut
c6c605bb01 add out of stock 2019-12-13 10:07:20 +06:30
Thein Lin Kyaw
58117d0f48 update order and request bill 2019-12-11 17:56:39 +06:30
Thein Lin Kyaw
b0452030b0 fix menu attributes error 2019-12-10 16:34:58 +06:30
Myat Zin Wai Maw
79598c0126 shop code 2019-12-10 15:18:48 +06:30
Myat Zin Wai Maw
c606ca73db foodcourt 2019-12-10 13:37:06 +06:30
Myat Zin Wai Maw
5b3a62917d void 2019-12-09 17:27:38 +06:30
Thein Lin Kyaw
3a99e1bb09 update for order process
Add activereocrd-import gem for bulk insert
2019-12-09 10:33:19 +06:30
Myat Zin Wai Maw
fabf3f613e app 2019-12-05 11:06:12 +06:30
Myat Zin Wai Maw
7a4db5e0f4 app order with order 2019-12-04 16:18:06 +06:30
Thein Lin Kyaw
dc1f464b7f update api/resturant/menu 2019-12-04 15:49:03 +06:30
Myat Zin Wai Maw
7e7f8f173f app order 2019-12-04 14:37:21 +06:30
Myat Zin Wai Maw
6c1b6fe79f app 2019-12-04 14:18:37 +06:30
Nweni
8b5d28524e shop code 2019-12-04 13:57:26 +06:30
Myat Zin Wai Maw
0b98f3a149 Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt 2019-12-04 13:33:31 +06:30
Myat Zin Wai Maw
08f5689841 print 2019-12-04 13:33:13 +06:30
Nweni
7afddcdf2b shop code 2019-12-04 10:49:46 +06:30
Myat Zin Wai Maw
840f0f9c43 Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt 2019-12-03 17:49:21 +06:30
Myat Zin Wai Maw
fe56286c76 app order 2019-12-03 17:49:01 +06:30
Thein Lin Kyaw
c8c39b0636 update origami/home/index 2019-12-03 16:15:48 +06:30
Nweni
78838a7718 current shop 2019-12-03 14:54:53 +06:30
Nweni
e0b912bfa0 current shop 2019-12-03 13:43:26 +06:30
Nweni
417d64ecae fixed conflict after merch dev for current shop 2019-12-02 19:30:24 +06:30
Nweni
a59c662188 Merge branch 'foodcourt' of https://gitlab.com/code2lab/SXRestaurant into foodcourt 2019-12-02 18:02:50 +06:30
Thein Lin Kyaw
1607cb70d3 Single database for multiple shops
Use ActsAsTenant as Multi-tenancy for shops

See below files:
- app/controllers/concern/multi_tenancy.rb
- app/models/application_record.rb
- app/models/shop.rb

An initializer can be created to control option in ActsAsTenant.

config/initializers/acts_as_tenant.rb
require 'acts_as_tenant/sidekiq'

ActsAsTenant.configure do |config|
  config.require_tenant = false # true
end

more detail: https://github.com/ErwinM/acts_as_tenant
2019-12-02 18:02:39 +06:30
Myat Zin Wai Maw
600d3973cd app order 2019-12-02 17:48:36 +06:30
Nweni
de73bf9f7d fixed conflict 2019-12-02 17:43:02 +06:30
Thein Lin Kyaw
937f40e7c1 Single database for multiple shops
Use ActsAsTenant as Multi-tenancy for shops

See below files:
- app/controllers/concern/multi_tenancy.rb
- app/models/application_record.rb
- app/models/shop.rb

An initializer can be created to control option in ActsAsTenant.
config/initializers/acts_as_tenant.rb
require 'acts_as_tenant/sidekiq'
ActsAsTenant.configure do |config|
  config.require_tenant = false # true
end

more details: https://github.com/ErwinM/acts_as_tenant
2019-12-02 17:19:28 +06:30
Myat Zin Wai Maw
cac6994ccb separate foodcourt module 2019-12-02 16:10:51 +06:30
Thein Lin Kyaw
18cb9ba23c fix sub menu category error 2019-11-29 15:47:15 +06:30
Thein Lin Kyaw
b2508ac20a fix bugs and update code
Merge branch 'r-1902001-01-dev' into r-1902001-01
2019-11-29 14:36:57 +06:30
Nweni
3a85f1e319 current shop changes 2019-11-28 18:33:56 +06:30
NyanLinHtut
3c5755a028 fixed set items in origami 2019-11-28 17:27:28 +06:30
Nweni
d41d957688 fixed conflict after merge with dev 2019-11-28 16:47:12 +06:30
Myat Zin Wai Maw
09e7650452 order from app 2019-11-28 15:52:50 +06:30
Nweni
f035c2fe10 fixed conflict 2019-11-28 14:19:37 +06:30
Thein Lin Kyaw
2010b6a4bb update number_formattable. update dashboard query. 2019-11-28 14:13:00 +06:30
Nweni
858ddfd93b Merge branch 'foodcourt' of https://gitlab.com/code2lab/SXRestaurant into foodcourt 2019-11-27 15:51:14 +06:30
Myat Zin Wai Maw
fe5dc6bb5a card payment 2019-11-27 15:05:42 +06:30
Nweni
a0b7557f06 fixed conflict after merge with dev branch for report query updated 2019-11-27 14:09:16 +06:30
Nweni
845d6662c9 Verify 2019-11-27 09:36:30 +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
6fbf30c950 fixed conflict 2019-11-25 09:26:21 +06:30
Myat Zin Wai Maw
d1ab2c194d shop code 2019-11-22 18:24:02 +06:30
Nweni
336e32f1a6 fixed daliy sales report - payment method error 2019-11-20 09:44:49 +06:30