From 6e9ecd342bec964e10eada221930702671e31dbb Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 12 Mar 2018 10:42:29 +0630 Subject: [PATCH] update second display --- app/assets/images/second.jpg | Bin 10769 -> 0 bytes app/assets/javascripts/addorder.js | 32 ++++++++++++++++++ .../origami/second_display/_slider.html.erb | 2 +- config/initializers/action_controller.rb | 10 +++--- config/license.yml | 15 -------- 5 files changed, 38 insertions(+), 21 deletions(-) delete mode 100644 app/assets/images/second.jpg delete mode 100644 config/license.yml diff --git a/app/assets/images/second.jpg b/app/assets/images/second.jpg deleted file mode 100644 index b7063459263fd79ec6c1f5b9194607102461c737..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10769 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 min_qty) { + + item = get_set_item(items); + console.log(item) + // customer_display_view(item,"add"); + attribute_arr = [] option_arr = [] @@ -685,6 +690,7 @@ $(function() { $('.add_to_order').attr('data-options',JSON.stringify(option_arr)); var item_data = $(this); item = get_item(item_data); + console.log(item) customer_display_view(item,"add"); show_item_detail(item_data); calculate_sub_total(); @@ -1173,6 +1179,32 @@ $(function() { return sale_items; } + /* Get Item rows */ + function get_set_item(items){ + var sale_items = []; + + var sale_item = {}; + sale_item.code = $('.set-item').attr('data-code'); + sale_item.name = $('.set-item').attr('data-name'); + sale_item.price = $('.set-item').attr('data-price'); + sale_item.option = $('.set-item').attr('data-options'); + sale_item.parent = $('.set-item').attr('data-parent'); + + sale_items.push(sale_item); + + $(items).each(function(i){ + sale_item,code = $(items[i]).attr('data-code'); + sale_item,name = $(items[i]).attr('data-name'); + sale_item,price = $(items[i]).attr('data-price'); + sale_item,option = $(items[i]).attr('data-options'); + sale_item,sub_item = $(items[i]).attr('data-sub-item'); + sale_items.push(sale_item); + }); + + + return sale_items; + } + function customer_display_view(data,status) { $.ajax({ type: "POST", diff --git a/app/views/origami/second_display/_slider.html.erb b/app/views/origami/second_display/_slider.html.erb index 9d01a463..61c71203 100644 --- a/app/views/origami/second_display/_slider.html.erb +++ b/app/views/origami/second_display/_slider.html.erb @@ -3,7 +3,7 @@ <%= javascript_include_tag 'wow_script', 'data-turbolinks-track': 'reload' %>
-
+
  • <%= image_tag("slider/s1.jpg", :alt => "rss feed") %>
  • diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index 8f310dab..02e35bb8 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -20,11 +20,11 @@ class ActionController::Base end else # check for license file - if check_license - current_license(ENV["SX_PROVISION_URL"]) - else - redirect_to activate_path - end + # if check_license + # current_license(ENV["SX_PROVISION_URL"]) + # else + # redirect_to activate_path + # end end end diff --git a/config/license.yml b/config/license.yml deleted file mode 100644 index fefa7d40..00000000 --- a/config/license.yml +++ /dev/null @@ -1,15 +0,0 @@ -iv_key: f3ICP0M2HJLIeXURn3yv5A== -shop_name: sx_license_test3 -email: aungmyo.zaw@code2lab.com -telephone: 0099404923 -fax: 49494949432 -address: Yangon -dbhost: m4ZCds3ANyqjqCgZVSTfRQ== -dbschema: +mvY73HAjWqMrby9Zu+tBg== -dbusername: UO2rBxhoSfDEKutK2OEL4A== -dbpassword: sVpy+Lj6i3MpT+CjoJrDOw== -api_token: srTutEOCzphDFOXQqVWnZwQDTXiHdzwzY -app_token: pSzbojYfXLNpSLmhdNTfLCtxfzeUahO -plan_sku: +53eC6oiOsBRxtBgVjyULw== -renewable_date: hon6p5jvfirTFniaFrH0qw== -plan_name: eaMIWzHlTnljCEkE2oxoHg==