git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add extra hour 15 and 45 minutes

Browse Source
This commit is contained in:
phyusin
2018-01-15 14:19:41 +06:30
parent b1d6cca08d
commit 51041bf0ae
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/api/orders_controller.rb
View File

@@ -54,12 +54,18 @@ class Api::OrdersController < Api::ApiController
extra_time = '' extra_time = ''
params[:order_items].each { |i| 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 is_extra_time = true
if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30' if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
t = Time.now t = Time.now
time = 30*60*i["quantity"].to_i time = 30*60*i["quantity"].to_i
extra_time = Time.at(time) 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 else
t = Time.now t = Time.now
time = 60*60*i["quantity"].to_i time = 60*60*i["quantity"].to_i

8
app/controllers/origami/addorders_controller.rb
View File

@@ -67,11 +67,17 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
items_arr = [] items_arr = []
JSON.parse(params[:order_items]).each { |i| 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 is_extra_time = true
if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30' if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
time = 30*60*i["quantity"].to_i time = 30*60*i["quantity"].to_i
extra_time = Time.at(time) 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 else
time = 60*60*i["quantity"].to_i time = 60*60*i["quantity"].to_i
extra_time = Time.at(time) extra_time = Time.at(time)