From 51041bf0ae6e007e907e07791e500e8d7e342fa2 Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 15 Jan 2018 14:19:41 +0630 Subject: [PATCH] add extra hour 15 and 45 minutes --- app/controllers/api/orders_controller.rb | 8 +++++++- app/controllers/origami/addorders_controller.rb | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index cd8c7ca2..1616be04 100755 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -54,12 +54,18 @@ class Api::OrdersController < Api::ApiController extra_time = '' params[:order_items].each { |i| - if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' + if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' || i["item_instance_code"] == 'Extie45' || i["item_instance_code"] == 'Extie15' is_extra_time = true if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30' t = Time.now time = 30*60*i["quantity"].to_i extra_time = Time.at(time) + elsif i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie15' + time = 15*60*i["quantity"].to_i + extra_time = Time.at(time) + elsif i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extie45' + time = 45*60*i["quantity"].to_i + extra_time = Time.at(time) else t = Time.now time = 60*60*i["quantity"].to_i diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 1a9aaa9a..9a06af0b 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -67,11 +67,17 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController items_arr = [] JSON.parse(params[:order_items]).each { |i| - if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' + if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' || i["item_instance_code"] == 'Extie45' || i["item_instance_code"] == 'Extie15' is_extra_time = true if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30' time = 30*60*i["quantity"].to_i extra_time = Time.at(time) + elsif i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie15' + time = 15*60*i["quantity"].to_i + extra_time = Time.at(time) + elsif i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extie45' + time = 45*60*i["quantity"].to_i + extra_time = Time.at(time) else time = 60*60*i["quantity"].to_i extra_time = Time.at(time)