diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index 1616be04..deb1039e 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -54,22 +54,13 @@ 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"] == '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'
+       i["item_instance_code"] = i["item_instance_code"].downcase.to_s
+       if i["item_instance_code"].include? "ext"
          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
-           extra_time = Time.at(time)
+         arr_exts = i["item_instance_code"].split("_")
+         if arr_exts[1].match(/^(\d)+$/)
+          time = arr_exts[1].to_i*60*i["quantity"].to_i
+          extra_time = Time.at(time)
          end
        end
      }
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 9a06af0b..6b4200da 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -67,20 +67,13 @@ 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"] == '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'
+      i["item_instance_code"] = i["item_instance_code"].downcase.to_s
+       if i["item_instance_code"].include? "ext"
          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)
+         arr_exts = i["item_instance_code"].split("_")
+         if arr_exts[1].match(/^(\d)+$/)
+          time = arr_exts[1].to_i*60*i["quantity"].to_i
+          extra_time = Time.at(time)
          end
        end
        items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}