From 2e9847986da1c73aa9bd0d7824226ba06d46a64a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 30 Nov 2017 17:58:42 +0630 Subject: [PATCH 1/3] update paymentmenthd for foc --- app/models/sale.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 48fbdc9b..55f6f516 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -522,7 +522,6 @@ def self.daily_sales_list(from,to) SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount, SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount") .joins("join (select * from sale_payments group by sale_payments.sale_id, sale_payments.payment_method) sale_payments on sale_payments.sale_id = sales.sale_id") - # .where("sale_status = ? AND sales.receipt_date between ? and ? AND total_amount != 0", 'completed', from, to) .where("sale_status = ? AND sales.receipt_date between ? and ? ", 'completed', from, to) .group("DATE_FORMAT((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')),'%Y-%m-%d')") From 281ea9910a27f29e75ced9b29cf0f7207959c6e2 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 30 Nov 2017 20:03:12 +0630 Subject: [PATCH 2/3] license --- config/secrets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/secrets.yml b/config/secrets.yml index f8456ee3..3e8ad936 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -12,8 +12,8 @@ development: secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 - sx_provision_url: 192.168.1.147:3002/api #provision.zsai.ws/api - server_mode: application + sx_provision_url: connect.smartsales.asia/api #provision.zsai.ws/api + server_mode: cloud cipher_type: AES-256-CBC sx_key: Wh@t1$C2L aes_key: <%= ENV['AES_KEY'] %> From c559222f3635896bcba139746d6708f16a4df73a Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 1 Dec 2017 11:22:05 +0630 Subject: [PATCH 3/3] add sub menu cat --- app/views/api/restaurant/menu/_menu.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/api/restaurant/menu/_menu.json.jbuilder b/app/views/api/restaurant/menu/_menu.json.jbuilder index 29982631..9441daf9 100755 --- a/app/views/api/restaurant/menu/_menu.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu.json.jbuilder @@ -9,6 +9,7 @@ if (menu.menu_categories) json.id category.id json.name category.name json.alt_name category.alt_name + json.parent_id category.menu_category_id json.is_available category.is_available if category.menu_items