git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,383 Commits 1 Branch 0 Tags
b730da7a75fac2e2c114fcab511d487f621a81f6
Commit Graph

1152 Commits

Author SHA1 Message Date
NyanLinHtut
450c847da6 Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev 2019-12-23 09:48:20 +06:30
NyanLinHtut
c87a2e579b - 2019-12-23 09:48:11 +06:30
Thein Lin Kyaw
99c943a865 fix api addorder and foc payment status 2019-12-20 16:38:21 +06:30
NyanLinHtut
10c1ba12af - 2019-12-20 15:48:38 +06:30
Myat Zin Wai Maw
54109c5273 fix conflict 2019-12-20 14:17:23 +06:30
Myat Zin Wai Maw
e3207ed1d5 quick service tax 2019-12-20 14:12:57 +06:30
Thein Lin Kyaw
d87ffee65b update seed generator and remove hard-coded customer id 2019-12-20 10:35:31 +06:30
Thein Lin Kyaw
92e467d512 Fix bugs and improvements 
fix payment outstanding with amount <= 0
fix payment outstanding with other payments
 2019-12-18 15:41:18 +06:30
NyanLinHtut
358fbcd134 Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt 2019-12-18 14:19:06 +06:30
NyanLinHtut
40cd6aacc8 fixed second display 2019-12-18 14:18:59 +06:30
Myat Zin Wai Maw
8af99742a3 bill and tax 2019-12-17 15:06:37 +06:30
Thein Lin Kyaw
e6392c3bd4 update for addorder and printer 2019-12-17 15:02:58 +06:30
Thein Lin Kyaw
40ad724e77 update split bill 2019-12-16 11:20:15 +06:30
Myat Zin Wai Maw
f45849de49 shop 2019-12-13 10:12:08 +06:30
Thein Lin Kyaw
58117d0f48 update order and request bill 2019-12-11 17:56:39 +06:30
Myat Zin Wai Maw
79598c0126 shop code 2019-12-10 15:18:48 +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
Thein Lin Kyaw
67e7658e56 Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev 2019-12-09 10:30:13 +06:30
Myat Zin Wai Maw
b0f6368248 shop_code 2019-12-05 14:56:47 +06:30
Thein Lin Kyaw
dc1f464b7f update api/resturant/menu 2019-12-04 15:49:03 +06:30
Nweni
7afddcdf2b shop code 2019-12-04 10:49:46 +06:30
Nweni
3b5b6c78f3 fixed conflict 2019-12-04 10:37:52 +06:30
Nweni
ca92a07919 shop code missing 2019-12-03 20:19:42 +06:30
Nweni
15361fe4e1 verfication controller 2019-12-03 18:22:38 +06:30
Thein Lin Kyaw
c8c39b0636 update origami/home/index 2019-12-03 16:15:48 +06:30
Nweni
e0b912bfa0 current shop 2019-12-03 13:43:26 +06:30
Thein Lin Kyaw
108415ed3f update dine-in pay bill 2019-12-03 10:02:49 +06:30
Nweni
417d64ecae fixed conflict after merch dev for current shop 2019-12-02 19:30:24 +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
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
Nweni
bf337495c1 dashboard 2019-11-29 12:08:41 +06:30
Thein Lin Kyaw
5b88d16485 update number_formattable 2019-11-28 19:25:52 +06:30
Nweni
3a85f1e319 current shop changes 2019-11-28 18:33:56 +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
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
98b74af6cf Merge branch 'foodcourt' of https://gitlab.com/code2lab/SXRestaurant into foodcourt 2019-11-27 09:36:39 +06:30
Myat Zin Wai Maw
5dd4c6e7b6 shop code filter for all reports and transactions 2019-11-26 12:06:52 +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
3b468b78f4 changes in verification 2019-11-22 18:03:41 +06:30
NyanLinHtut
a36e170d94 inventory for set items 2019-11-20 15:14:09 +06:30
Myat Zin Wai Maw
5a3f328789 test 2019-11-19 14:59:45 +06:30