Skip to content
This repository was archived by the owner on Apr 27, 2023. It is now read-only.

Add taxes_included attribute to order object #142

Open
gavinballard wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add taxes_included attribute to order object #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/shopify_transporter/shopify/order.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def header
'Name', 'Email', 'Financial Status', 'Fulfillment Status', 'Currency',
'Buyer Accepts Marketing', 'Cancel Reason', 'Cancelled At', 'Closed At', 'Tags', 'Note',
'Phone', 'Referring Site', 'Processed At', 'Source name', 'Total weight',
'Total Tax', 'Shipping Company', 'Shipping Name', 'Shipping Phone', 'Shipping First Name',
'Total Tax', 'Taxes Included', 'Shipping Company', 'Shipping Name', 'Shipping Phone', 'Shipping First Name',
'Shipping Last Name', 'Shipping Address1', 'Shipping Address2', 'Shipping City',
'Shipping Province', 'Shipping Province Code', 'Shipping Zip', 'Shipping Country',
'Shipping Country Code', 'Billing Company', 'Billing Name', 'Billing Phone',
Expand Down Expand Up @@ -60,7 +60,7 @@ def to_csv
TOP_LEVEL_ATTRIBUTES = %w(
name email financial_status fulfillment_status currency
buyer_accepts_marketing cancel_reason cancelled_at closed_at tags note
phone referring_site processed_at source_name total_discounts total_weight total_tax
phone referring_site processed_at source_name total_discounts total_weight total_tax taxes_included
)

ADDRESS_ATTRIBUTES = %w(
Expand Down
10 changes: 5 additions & 5 deletions spec/files/transporter_csv_templates/orders.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name,Email,Financial Status,Fulfillment Status,Currency,Buyer Accepts Marketing,Cancel Reason,Cancelled At,Closed At,Tags,Note,Phone,Referring Site,Processed At,Source name,Total weight,Total Tax,Shipping Company,Shipping Name,Shipping Phone,Shipping First Name,Shipping Last Name,Shipping Address1,Shipping Address2,Shipping City,Shipping Province,Shipping Province Code,Shipping Zip,Shipping Country,Shipping Country Code,Billing Company,Billing Name,Billing Phone,Billing First Name,Billing Last Name,Billing Address1,Billing Address2,Billing City,Billing Province,Billing Province Code,Billing Zip,Billing Country,Billing Country Code,Lineitem name,Lineitem quantity,Lineitem price,Lineitem sku,Lineitem requires shipping,Lineitem taxable,Lineitem fulfillment status,Tax 1 Title,Tax 1 Price,Tax 1 Rate,Tax 2 Title,Tax 2 Price,Tax 2 Rate,Tax 3 Title,Tax 3 Price,Tax 3 Rate,Transaction amount,Transaction kind,Transaction status,Shipping line code,Shipping line price,Shipping line title,Shipping line carrier identifier,Shipping Tax Price,Discount code,Discount amount,Discount type,Metafield Namespace,Metafield Key,Metafield Value,Metafield Value Type
#MA-1097,john.doe@acme.com,paid,unfulfilled,USD,true,,,,,"Review verified, discount code e-mailed",555 555-5555,http://acme-influencers.com,2018-01-04 15:51:23 -0800,,,,Acme Warehouse,Receiver Joe,555.555.5556,Receiver,Joe,57 Erb St W,,Waterloo,Ontario,ON,N2L 6C2,Canada,CA,Acme Ltd.,Ami Shaperi,555.555.5557,Ami,Shaperi,150 Elgin St,Unit 56,Ottawa,Ontario,ON,K2P 1L4,Canaada,CA,Garden Trowel - Composite / Small,2,10,a-123,true,true,fulfilled,HST,2.60,0.13,,,,,,,1000,sale,success,,,,,,25OFF,10,fixed_amount,instructions,wash,cold_water,string
#MA-1097,john.doe@acme.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Acme Ltd.,,,,,,,,,,,,,Mini Handle Shovel,3,20,a-456,true,true,fulfilled,HST,7.80,0.13,,,,,,500,refund,success,,,,,,,,,instructions,dry,tumble_dry,string
#MA-1097,john.doe@acme.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,United Parcel Service - 2nd Day Air,0,United Parcel Service - 2nd Day Air,ups_2DA,,,,,instructions,dry,tumble_dry,string
#MA-1098,jane.doe@acme.com,refunded,unfulfilled,USD,false,customer changed/cancelled order,2018-01-19 12:54:42 -0800,,,,,,2018-01-19 12:54:41 -0800,,,,,,,,,,,,,,,,,Acme Inc.,,,,,,,,,,,,,Big Brown Bear Boots,1,30,b-001,true,true,null,,,,,,,,,,,,,,,,,,,,,origin,country,China,string
Name,Email,Financial Status,Fulfillment Status,Currency,Buyer Accepts Marketing,Cancel Reason,Cancelled At,Closed At,Tags,Note,Phone,Referring Site,Processed At,Source name,Total weight,Total Tax,Taxes Included,Shipping Company,Shipping Name,Shipping Phone,Shipping First Name,Shipping Last Name,Shipping Address1,Shipping Address2,Shipping City,Shipping Province,Shipping Province Code,Shipping Zip,Shipping Country,Shipping Country Code,Billing Company,Billing Name,Billing Phone,Billing First Name,Billing Last Name,Billing Address1,Billing Address2,Billing City,Billing Province,Billing Province Code,Billing Zip,Billing Country,Billing Country Code,Lineitem name,Lineitem quantity,Lineitem price,Lineitem sku,Lineitem requires shipping,Lineitem taxable,Lineitem fulfillment status,Tax 1 Title,Tax 1 Price,Tax 1 Rate,Tax 2 Title,Tax 2 Price,Tax 2 Rate,Tax 3 Title,Tax 3 Price,Tax 3 Rate,Transaction amount,Transaction kind,Transaction status,Shipping line code,Shipping line price,Shipping line title,Shipping line carrier identifier,Shipping Tax Price,Discount code,Discount amount,Discount type,Metafield Namespace,Metafield Key,Metafield Value,Metafield Value Type
#MA-1097,john.doe@acme.com,paid,unfulfilled,USD,true,,,,,"Review verified, discount code e-mailed",555 555-5555,http://acme-influencers.com,2018-01-04 15:51:23 -0800,,,false,Acme Warehouse,Receiver Joe,555.555.5556,Receiver,Joe,57 Erb St W,,Waterloo,Ontario,ON,N2L 6C2,Canada,CA,Acme Ltd.,Ami Shaperi,555.555.5557,Ami,Shaperi,150 Elgin St,Unit 56,Ottawa,Ontario,ON,K2P 1L4,Canaada,CA,Garden Trowel - Composite / Small,2,10,a-123,true,true,fulfilled,HST,2.60,0.13,,,,,,,1000,sale,success,,,,,,25OFF,10,fixed_amount,instructions,wash,cold_water,string
#MA-1097,john.doe@acme.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Acme Ltd.,,,,,,,,,,,,,Mini Handle Shovel,3,20,a-456,true,true,fulfilled,HST,7.80,0.13,,,,,,500,refund,success,,,,,,,,,instructions,dry,tumble_dry,string
#MA-1097,john.doe@acme.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,United Parcel Service - 2nd Day Air,0,United Parcel Service - 2nd Day Air,ups_2DA,,,,,instructions,dry,tumble_dry,string
#MA-1098,jane.doe@acme.com,refunded,unfulfilled,USD,false,customer changed/cancelled order,2018-01-19 12:54:42 -0800,,,,,,2018-01-19 12:54:41 -0800,,,,,,,,,,,,,,,,,,Acme Inc.,,,,,,,,,,,,,Big Brown Bear Boots,1,30,b-001,true,true,null,,,,,,,,,,,,,,,,,,,,,origin,country,China,string
2 changes: 1 addition & 1 deletion spec/shopify_transporter/shopify/order_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module Shopify
%w(
name email financial_status fulfillment_status currency
buyer_accepts_marketing cancel_reason cancelled_at closed_at tags note
phone referring_site processed_at source_name total_weight total_tax
phone referring_site processed_at source_name total_weight total_tax taxes_included
)
end

Expand Down