Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/adapters/external_channel/haravan_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def refine_orders(records)
paid_at: paid_at,
billing_amount: record['total_price'],
ship_fee: record['shipping_lines'].inject(0) { |sum, line| sum + (line['price']) },
variant_ids: record['line_items'].map { |variant| [variant['variant_id'], variant['quantity'].to_i] },
variant_ids: record['line_items'].map { |variant| [variant['variant_id'], variant['quantity'].to_i, variant['price'].to_i ] },
cancelled_status: record['cancelled_status'],
shipping_status: record['fulfillments_status']
}
Expand Down
2 changes: 1 addition & 1 deletion app/adapters/external_channel/lazada_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ def refine_orders(records)
billing_amount: record['price'].to_i + record['shipping_fee'],
ship_fee: record['shipping_fee'],
cancelled_status: ['cancelled'].include?(order_item['status']) ? order_item['status'] : nil,
variant_ids: [[order_item['sku'].to_s, 1]],
variant_ids: [[order_item['sku'].to_s, 1, order_item['item_price'].to_i]],
shipping_status: %w[ready_to_ship, delivered, shipped returned].include?(record['statuses']) ? order_item['status'] : nil
}
end
Expand Down
2 changes: 1 addition & 1 deletion app/adapters/external_channel/sendo_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def refine_orders(orders)
id: sales_data['order_number'].to_s,
order_number: sales_data['order_number'],
billing_amount: sales_data['total_amount_buyer'],
variant_ids: sales_details.map { |option| [option['sku'], option['quantity']] },
variant_ids: sales_details.map { |option| [ option['sku'], option['quantity'].to_i, option['price'].to_i ] },
order_status: map_order_status(sales_data['order_status']),
cancelled_status: cancelled_status(sales_data['order_status']),
shipping_status: shipping_status(sales_data['order_status']),
Expand Down
2 changes: 1 addition & 1 deletion app/adapters/external_channel/shopee_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def variants(variants)
variants.map do |variant|
variant_id = variant['variation_id']
variant_id = variant['item_id'] if variant_id.zero?
[variant_id, variant['variation_quantity_purchased']]
[variant_id, variant['variation_quantity_purchased'], variant['variation_discounted_price'].to_i]
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion app/adapters/external_channel/tiki_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def refine_orders(records)
paid_at: nil,
billing_amount: record['invoice']['total_seller_income'],
ship_fee: record['invoice']['shipping_amount_after_discount'],
variant_ids: record['items'].map{ |variant| [variant['product']['id'], variant['invoice']['quantity'].to_i] },
variant_ids: record['items'].map{ |variant| [variant['product']['id'], variant['invoice']['quantity'].to_i, variant['invoice']['price'].to_i ] },
cancelled_status: record['cancel_info'],
shipping_status: record['shipping']['status']
}
Expand Down
1 change: 1 addition & 0 deletions app/services/external_channel/order/saver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def set_order_related_info(target, order)

order_to_option = ExternalChannel::CartItem.find_or_initialize_by(order_info_id: target.id, product_option_id: option.id)
order_to_option.option_count = variant[1]
order_to_option.unit_price = variant[2]
order_to_option.save!

option.brands.each do |brand|
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class AddPriceToEcCartItem < ActiveRecord::Migration[6.0]
def change
add_column :external_channel_cart_items, :unit_price, :integer
end
end