diff --git a/app/assets/images/second.jpg b/app/assets/images/second.jpg deleted file mode 100644 index b7063459..00000000 Binary files a/app/assets/images/second.jpg and /dev/null differ diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index bef42a03..bab72a06 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -366,6 +366,11 @@ $(function() { var items = $('.selected-instance'); if (items.length >= 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==