From 8494686d0ff9df51363dcd558f63b0bede76d4dc Mon Sep 17 00:00:00 2001 From: Cedric Collins Date: Mon, 12 Apr 2021 16:55:46 -0500 Subject: [PATCH] [IMP] delivery_hibou,delivery_ups_hibou,stock_delivery_planner: add ups_rate_shipment_multi H3455 --- delivery_ups_hibou/models/delivery_ups.py | 121 ++++++++++++++++++ .../models/ups_request_patch.py | 74 ++++++++--- 2 files changed, 175 insertions(+), 20 deletions(-) diff --git a/delivery_ups_hibou/models/delivery_ups.py b/delivery_ups_hibou/models/delivery_ups.py index 8285cdd6..245f29ba 100644 --- a/delivery_ups_hibou/models/delivery_ups.py +++ b/delivery_ups_hibou/models/delivery_ups.py @@ -2,6 +2,8 @@ from odoo import api, fields, models, _ from odoo.exceptions import UserError, ValidationError from odoo.addons.delivery_ups.models.ups_request import UPSRequest, Package from odoo.tools import pdf +import logging +_logger = logging.getLogger(__name__) class ProviderUPS(models.Model): @@ -216,3 +218,122 @@ class ProviderUPS(models.Model): 'tracking_number': carrier_tracking_ref} res = res + [shipping_data] return res + + def ups_rate_shipment_multi(self, order=None, picking=None): + superself = self.sudo() + srm = UPSRequest(self.log_xml, superself.ups_username, superself.ups_passwd, superself.ups_shipper_number, superself.ups_access_number, self.prod_environment) + ResCurrency = self.env['res.currency'] + max_weight = self.ups_default_packaging_id.max_weight + packages = [] + if order: + currency = order.currency_id + company = order.company_id + date_order = order.date_order or fields.Date.today() + total_qty = 0 + total_weight = 0 + for line in order.order_line.filtered(lambda line: not line.is_delivery): + total_qty += line.product_uom_qty + total_weight += line.product_id.weight * line.product_qty + + if max_weight and total_weight > max_weight: + total_package = int(total_weight / max_weight) + last_package_weight = total_weight % max_weight + + for seq in range(total_package): + packages.append(Package(self, max_weight)) + if last_package_weight: + packages.append(Package(self, last_package_weight)) + else: + packages.append(Package(self, total_weight)) + else: + currency = picking.sale_id.currency_id if picking.sale_id else picking.company_id.currency_id + company = picking.company_id + date_order = picking.sale_id.date_order or fields.Date.today() if picking.sale_id else fields.Date.today() + # Is total quantity the number of packages or the number of items being shipped? + total_qty = len(picking.package_ids) + packages = [Package(self, package.shipping_weight) for package in picking.package_ids] + + + shipment_info = { + 'total_qty': total_qty # required when service type = 'UPS Worldwide Express Freight' + } + + if self.ups_cod: + cod_info = { + 'currency': currency.name, + 'monetary_value': order.amount_total if order else picking.sale_id.amount_total, + 'funds_code': self.ups_cod_funds_code, + } + else: + cod_info = None + + # Hibou Delivery + shipper_company = self.get_shipper_company(order=order, picking=picking) + shipper_warehouse = self.get_shipper_warehouse(order=order, picking=picking) + recipient = self.get_recipient(order=order, picking=picking) + date_planned = fields.Datetime.now() + if self.env.context.get('date_planned'): + date_planned = self.env.context.get('date_planned') + + check_value = srm.check_required_value(shipper_company, shipper_warehouse, recipient, order=order, picking=picking) + if check_value: + return [{'success': False, + 'price': 0.0, + 'error_message': check_value, + 'warning_message': False, + }] + + #ups_service_type = order.ups_service_type or self.ups_default_service_type + ups_service_type = None # See if this gets us all service types + result = srm.get_shipping_price( + shipment_info=shipment_info, packages=packages, shipper=shipper_company, ship_from=shipper_warehouse, + ship_to=recipient, packaging_type=self.ups_default_packaging_id.shipper_package_code, service_type=ups_service_type, + saturday_delivery=self.ups_saturday_delivery, cod_info=cod_info, date_planned=date_planned, multi=True) + # Hibou Delivery + is_third_party = self._get_ups_is_third_party(order=order, picking=picking) + + response = [] + for rate in result: + if rate.get('error_message'): + _logger.error('UPS error: %s' % rate['error_message']) + response.append({ + 'success': False, 'price': 0.0, + 'error_message': _('Error:\n%s') % rate['error_message'], + 'warning_message': False, + }) + else: + if currency.name == rate['currency_code']: + price = float(rate['price']) + else: + quote_currency = ResCurrency.search([('name', '=', rate['currency_code'])], limit=1) + price = quote_currency._convert( + float(rate['price']), currency, company, date_order) + + if is_third_party: + # Don't show delivery amount, if ups bill my account option is true + price = 0.0 + + service_code = rate['service_code'] + carrier = self.ups_find_delivery_carrier_for_service(service_code) + if carrier: + response.append({ + 'carrier': carrier, + 'success': True, + 'price': price, + 'error_message': False, + 'warning_message': False, + 'date_planned': date_planned, + 'date_delivered': None, + 'transit_days': rate.get('transit_days', 0), + 'service_code': service_code, + }) + return response + + def ups_find_delivery_carrier_for_service(self, service_code): + if self.ups_default_service_type == service_code: + return self + # arbitrary decision, lets find the same account number + carrier = self.search([('ups_shipper_number', '=', self.ups_shipper_number), + ('ups_default_service_type', '=', service_code) + ], limit=1) + return carrier diff --git a/delivery_ups_hibou/models/ups_request_patch.py b/delivery_ups_hibou/models/ups_request_patch.py index 3104662e..1b811f16 100644 --- a/delivery_ups_hibou/models/ups_request_patch.py +++ b/delivery_ups_hibou/models/ups_request_patch.py @@ -1,15 +1,20 @@ import suds from odoo.addons.delivery_ups.models.ups_request import UPSRequest +import logging +_logger = logging.getLogger(__name__) SUDS_VERSION = suds.__version__ def patched_get_shipping_price(self, shipment_info, packages, shipper, ship_from, ship_to, packaging_type, service_type, - saturday_delivery, cod_info, date_planned=False): + saturday_delivery, cod_info, date_planned=False, multi=False): client = self._set_client(self.rate_wsdl, 'Rate', 'RateRequest') request = client.factory.create('ns0:RequestType') - request.RequestOption = 'Rate' + if multi: + request.RequestOption = 'Shop' + else: + request.RequestOption = 'Rate' classification = client.factory.create('ns2:CodeDescriptionType') classification.Code = '00' # Get rates for the shipper account @@ -60,10 +65,11 @@ def patched_get_shipping_price(self, shipment_info, packages, shipper, ship_from if not ship_to.commercial_partner_id.is_company: shipment.ShipTo.Address.ResidentialAddressIndicator = suds.null() - shipment.Service.Code = service_type or '' - shipment.Service.Description = 'Service Code' - if service_type == "96": - shipment.NumOfPieces = int(shipment_info.get('total_qty')) + if not multi: + shipment.Service.Code = service_type or '' + shipment.Service.Description = 'Service Code' + if service_type == "96": + shipment.NumOfPieces = int(shipment_info.get('total_qty')) if saturday_delivery: shipment.ShipmentServiceOptions.SaturdayDeliveryIndicator = saturday_delivery @@ -78,23 +84,45 @@ def patched_get_shipping_price(self, shipment_info, packages, shipper, ship_from # Check if ProcessRate is not success then return reason for that if response.Response.ResponseStatus.Code != "1": - return self.get_error_message(response.Response.ResponseStatus.Code, - response.Response.ResponseStatus.Description) + error_message = self.get_error_message(response.Response.ResponseStatus.Code, + response.Response.ResponseStatus.Description) + if multi: + return [error_message] + return error_message - result = {} - result['currency_code'] = response.RatedShipment[0].TotalCharges.CurrencyCode + if not multi: + result = {} + result['currency_code'] = response.RatedShipment[0].TotalCharges.CurrencyCode - # Some users are qualified to receive negotiated rates - negotiated_rate = 'NegotiatedRateCharges' in response.RatedShipment[0] and response.RatedShipment[ - 0].NegotiatedRateCharges.TotalCharge.MonetaryValue or None + # Some users are qualified to receive negotiated rates + negotiated_rate = 'NegotiatedRateCharges' in response.RatedShipment[0] and response.RatedShipment[ + 0].NegotiatedRateCharges.TotalCharge.MonetaryValue or None - result['price'] = negotiated_rate or response.RatedShipment[0].TotalCharges.MonetaryValue + result['price'] = negotiated_rate or response.RatedShipment[0].TotalCharges.MonetaryValue - # Hibou Delivery - if hasattr(response.RatedShipment[0], 'GuaranteedDelivery') and hasattr(response.RatedShipment[0].GuaranteedDelivery, 'BusinessDaysInTransit'): - result['transit_days'] = int(response.RatedShipment[0].GuaranteedDelivery.BusinessDaysInTransit) - # End + # Hibou Delivery + if hasattr(response.RatedShipment[0], 'GuaranteedDelivery') and hasattr(response.RatedShipment[0].GuaranteedDelivery, 'BusinessDaysInTransit'): + result['transit_days'] = int(response.RatedShipment[0].GuaranteedDelivery.BusinessDaysInTransit) + # End + else: + result = [] + for rated_shipment in response.RatedShipment: + rate = {} + rate['currency_code'] = rated_shipment.TotalCharges.CurrencyCode + # Some users are qualified to receive negotiated rates + negotiated_rate = 'NegotiatedRateCharges' in rated_shipment and response.RatedShipment[ + 0].NegotiatedRateCharges.TotalCharge.MonetaryValue or None + + rate['price'] = negotiated_rate or rated_shipment.TotalCharges.MonetaryValue + + # Hibou Delivery + if hasattr(rated_shipment, 'GuaranteedDelivery') and hasattr( + rated_shipment.GuaranteedDelivery, 'BusinessDaysInTransit'): + rate['transit_days'] = int(rated_shipment.GuaranteedDelivery.BusinessDaysInTransit) + # End + rate['service_code'] = rated_shipment.Service.Code + result.append(rate) return result except suds.WebFault as e: @@ -102,11 +130,17 @@ def patched_get_shipping_price(self, shipment_info, packages, shipper, ship_from prefix = '' if SUDS_VERSION >= "0.6": prefix = '/Envelope/Body/Fault' - return self.get_error_message( + error_message = self.get_error_message( e.document.childAtPath(prefix + '/detail/Errors/ErrorDetail/PrimaryErrorCode/Code').getText(), e.document.childAtPath(prefix + '/detail/Errors/ErrorDetail/PrimaryErrorCode/Description').getText()) + if multi: + return [error_message] + return error_message except IOError as e: - return self.get_error_message('0', 'UPS Server Not Found:\n%s' % e) + error_message = self.get_error_message('0', 'UPS Server Not Found:\n%s' % e) + if multi: + return [error_message] + return error_message UPSRequest.get_shipping_price = patched_get_shipping_price