diff --git a/website_sale_signifyd/models/sale_order.py b/website_sale_signifyd/models/sale_order.py index 9fd51509..5832e943 100644 --- a/website_sale_signifyd/models/sale_order.py +++ b/website_sale_signifyd/models/sale_order.py @@ -125,16 +125,17 @@ class SaleOrder(models.Model): 'confirmationEmail': self.partner_id.email, 'confirmationPhone': self.partner_id.phone, 'products': [ - 'itemName': line.product_id.name, - 'itemPrice': line.price_unit, - 'itemQuantity': line.product_uom_qty, - 'itemIsDigital': line.product_id.is_digital, - 'itemCategory': line.product_id.categ_id.name, - # 'itemSubCategory'? - 'itemId': line.product_id.id, - 'itemUrl': line.product_id.website_url, - 'itemWeight': line.product_id.weight, - for line in self.order_line if line.product_id + { + 'itemName': line.product_id.name, + 'itemPrice': line.price_unit, + 'itemQuantity': line.product_uom_qty, + 'itemIsDigital': line.product_id.is_digital, + 'itemCategory': line.product_id.categ_id.name, + # 'itemSubCategory'? + 'itemId': line.product_id.id, + 'itemUrl': line.product_id.website_url, + 'itemWeight': line.product_id.weight, + } for line in self.order_line if line.product_id ], 'shipments': [ { @@ -146,24 +147,24 @@ class SaleOrder(models.Model): }, 'transactions': [ { - "parentTransactionId": None, - "transactionId": tx.id, - "gateway": tx.acquirer_id.name, - "paymentMethod": "CREDIT_CARD", - "gatewayStatusCode": tx_status_type.get(tx.state, 'PENDING'), - "currency": tx.currency_id.name, - "amount": tx.amount, + 'parentTransactionId': None, + 'transactionId': tx.id, + 'gateway': tx.acquirer_id.name, + 'paymentMethod': 'CREDIT_CARD', + 'gatewayStatusCode': tx_status_type.get(tx.state, 'PENDING'), + 'currency': tx.currency_id.name, + 'amount': tx.amount, # "avsResponseCode": "Y", # "cvvResponseCode": "N", - "checkoutPaymentDetails": { - "accountHolderName": tx.partner_id.name, - "billingAddress": { - "streetAddress": tx.partner_id.street, - "unit": tx.partner_id.street2, - "city": tx.partner_id.city, - "provinceCode": tx.partner_id.state_id.code, - "postalCode": tx.partner_id.zip, - "countryCode": tx.partner_id.country_id.code, + 'checkoutPaymentDetails': { + 'accountHolderName': tx.partner_id.name, + 'billingAddress': { + 'streetAddress': tx.partner_id.street, + 'unit': tx.partner_id.street2, + 'city': tx.partner_id.city, + 'provinceCode': tx.partner_id.state_id.code, + 'postalCode': tx.partner_id.zip, + 'countryCode': tx.partner_id.country_id.code, } } } @@ -175,7 +176,7 @@ class SaleOrder(models.Model): optional_keys = ['itemUrl', 'itemWeight'] for key in optional_keys: if not line[key]: - line.pop(key) + line.pop(key) # API v2 # new_case_vals = { diff --git a/website_sale_signifyd/models/signifyd_coverage.py b/website_sale_signifyd/models/signifyd_coverage.py index 82a4739f..0d576ff3 100644 --- a/website_sale_signifyd/models/signifyd_coverage.py +++ b/website_sale_signifyd/models/signifyd_coverage.py @@ -8,7 +8,7 @@ class SignifydCoverage(models.Model): name = fields.Char(required=True) description = fields.Char() code = fields.Char(required=True) - exclusive = fields.Boolean()) + exclusive = fields.Boolean() def _apply_exclusivity(self): return self.filtered('exclusive')[:1] or self diff --git a/website_sale_signifyd/views/payment_views.xml b/website_sale_signifyd/views/payment_views.xml index 3efe1533..3c2b5a83 100644 --- a/website_sale_signifyd/views/payment_views.xml +++ b/website_sale_signifyd/views/payment_views.xml @@ -8,9 +8,9 @@ - + - \ No newline at end of file + diff --git a/website_sale_signifyd/views/signifyd_views.xml b/website_sale_signifyd/views/signifyd_views.xml index 9bc5585d..1f6844cf 100644 --- a/website_sale_signifyd/views/signifyd_views.xml +++ b/website_sale_signifyd/views/signifyd_views.xml @@ -107,7 +107,7 @@ - +

Optional: Add users to be notified if a sale order is declined by Signifyd.

@@ -145,4 +145,4 @@ id="menu_action_signifyd_connector" sequence="10" /> - \ No newline at end of file +