From 955b9a806f356fb49427046aee731a2e72cae6a8 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 2 Jan 2018 17:44:18 +0630 Subject: [PATCH] update extim and extie --- README.md | 7 +++++++ .../origami/addorders_controller.rb | 4 ++-- app/views/origami/addorders/detail.html.erb | 19 ++++++++++--------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 5ff1aeda..0032cc78 100755 --- a/README.md +++ b/README.md @@ -33,6 +33,13 @@ ruby 2.4.1p111 java -jar ~/Documents/Jade.jar http://192.168.1.88:3002 +Extra Time + + category_code = Ext001 + category_code = Ext002 + instance_code = Extim30, Extim60 //for morning menu + instance_code = Extie30, Extie60 //for evening menu + * ToDo list 1. Cloud Sync diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 5aedca8c..1a9aaa9a 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -67,9 +67,9 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController items_arr = [] JSON.parse(params[:order_items]).each { |i| - if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30' + if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' is_extra_time = true - if i["item_instance_code"] == 'Exti30' + if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30' time = 30*60*i["quantity"].to_i extra_time = Time.at(time) else diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index d8909915..050a4a18 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -7,16 +7,17 @@