Commit c0dab2d3 by Truong Ba Dieu

Refactor

parent ce5b42b0
...@@ -20,6 +20,7 @@ class ApplicationController < ActionController::Base ...@@ -20,6 +20,7 @@ class ApplicationController < ActionController::Base
end end
end end
private
def configure_permitted_parameters def configure_permitted_parameters
devise_parameter_sanitizer.for(:sign_up).push(:name) devise_parameter_sanitizer.for(:sign_up).push(:name)
devise_parameter_sanitizer.for(:account_update).push(:name) devise_parameter_sanitizer.for(:account_update).push(:name)
......
...@@ -18,7 +18,7 @@ class LineItem < ActiveRecord::Base ...@@ -18,7 +18,7 @@ class LineItem < ActiveRecord::Base
def check_product_stock def check_product_stock
change_square = quantity - quantity_was change_square = quantity - quantity_was
if change_square > product.stock if change_square > product.stock
self.errors.add(:quantity, "Product #{product.title} is not enough in stock") self.errors.add(:quantity, "Product #{product.try(:title)} is not enough in stock")
return false return false
end end
end end
......
...@@ -7,7 +7,6 @@ class Order < ActiveRecord::Base ...@@ -7,7 +7,6 @@ class Order < ActiveRecord::Base
accepts_nested_attributes_for :line_items accepts_nested_attributes_for :line_items
def recalculate def recalculate
puts "=================================== #{line_items.inject(0) {|sum, item| sum + item.quantity*item.price }}"
count = line_items.sum(:quantity) count = line_items.sum(:quantity)
self.update_columns( self.update_columns(
item_count: count, item_count: count,
......
...@@ -27,7 +27,6 @@ class CartService ...@@ -27,7 +27,6 @@ class CartService
end end
def self.update_cart(current_order, params) def self.update_cart(current_order, params)
if current_order.update_attributes(params) if current_order.update_attributes(params)
return true, "Update cart successfully" return true, "Update cart successfully"
else else
......
...@@ -5,9 +5,9 @@ class VacuumAwsService ...@@ -5,9 +5,9 @@ class VacuumAwsService
request = Vacuum.new(options[:country_code]) request = Vacuum.new(options[:country_code])
request.configure( request.configure(
aws_access_key_id: 'AKIAJ77C4CTZOP7TUVWQ', aws_access_key_id: ENV['aws_access_key_id'],
aws_secret_access_key: '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', aws_secret_access_key: ENV['aws_secret_access_key'],
associate_tag: 'zigexn6400-22' associate_tag: ENV['associate_tag']
) )
request.item_search( request.item_search(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment