[IMP] delivery_stamps,delivery_fedex_hibou: add stamps_rate_shipment_multi and remove logging

H3455

delivery_fedex_hibou/models/fedex_request.py

@@ -2,8 +2,6 @@ import suds
 from datetime import datetime
 from copy import deepcopy
 from odoo.addons.delivery_fedex.models import fedex_request
-import logging
-_logger = logging.getLogger(__name__)
 
 STATECODE_REQUIRED_COUNTRIES = fedex_request.STATECODE_REQUIRED_COUNTRIES
 
@@ -187,7 +185,6 @@ class FedexRequest(fedex_request.FedexRequest):
                                                          Version=self.VersionId,
                                                          RequestedShipment=self.RequestedShipment,
                                                          ReturnTransitAndCommit=True)  # New ReturnTransitAndCommit for CommitDetails in response
-            # _logger.warn(self.response)
 
             if (self.response.HighestSeverity != 'ERROR' and self.response.HighestSeverity != 'FAILURE'):
                 if not getattr(self.response, "RateReplyDetails", False):
@@ -212,16 +209,13 @@ class FedexRequest(fedex_request.FedexRequest):
                         formatted_response['transit_days'] = transit_days
                 else:
                     for rate_reply_detail in self.response.RateReplyDetails:
-                        _logger.warn('iterated RateReplyDetail: ' + str(rate_reply_detail))
                         res = deepcopy(formatted_response)
                         res['service_code'] = rate_reply_detail.ServiceType
                         for rating in rate_reply_detail.RatedShipmentDetails:
                             res['price'][rating.ShipmentRateDetail.TotalNetFedExCharge.Currency] = rating.ShipmentRateDetail.TotalNetFedExCharge.Amount
-                            _logger.warn('  inside rating iteration res: ' + str(res))
                         if len(rate_reply_detail.RatedShipmentDetails) == 1:
                             if 'CurrencyExchangeRate' in rate_reply_detail.RatedShipmentDetails[0].ShipmentRateDetail:
                                 res['price'][rate_reply_detail.RatedShipmentDetails[0].ShipmentRateDetail.CurrencyExchangeRate.FromCurrency] = rate_reply_detail.RatedShipmentDetails[0].ShipmentRateDetail.TotalNetFedExCharge.Amount / rate_reply_detail.RatedShipmentDetails[0].ShipmentRateDetail.CurrencyExchangeRate.Rate
-                        _logger.warn('end rate ' + str(res))
                         # Hibou Delivery Planning
                         if hasattr(rate_reply_detail, 'DeliveryTimestamp') and rate_reply_detail.DeliveryTimestamp:
                             res['date_delivered'] = rate_reply_detail.DeliveryTimestamp

delivery_stamps/models/delivery_stamps.py

@@ -123,6 +123,28 @@ class ProviderStamps(models.Model):
         ret_val.ContentType = 'Merchandise'
         return ret_val
 
+    def _get_stamps_shipping_multi(self, service, date_planned, order=False, picking=False):
+        if order:
+            weight = sum([(line.product_id.weight * line.product_qty) for line in order.order_line]) or 0.0
+        else:
+            weight = picking.shipping_weight
+        weight = self._stamps_convert_weight(weight)
+
+        shipper = self.get_shipper_warehouse(order=order, picking=picking)
+        recipient = self.get_recipient(order=order, picking=picking)
+
+        if not all((shipper.zip, recipient.zip)):
+            raise ValidationError('Stamps needs ZIP. From: ' + str(shipper.zip) + ' To: ' + str(recipient.zip))
+
+        ret_val = service.create_shipping()
+        ret_val.ShipDate = date_planned.strftime('%Y-%m-%d') if date_planned else date.today().isoformat()
+        ret_val.FromZIPCode = shipper.zip.split('-')[0]
+        ret_val.ToZIPCode = recipient.zip.split('-')[0]
+        ret_val.PackageType = self._stamps_package_type()
+        ret_val.WeightLb = weight
+        ret_val.ContentType = 'Merchandise'
+        return ret_val
+
     def _stamps_get_addresses_for_picking(self, picking):
         company = self.get_shipper_company(picking=picking)
         from_ = self.get_shipper_warehouse(picking=picking)
@@ -336,3 +358,63 @@ class ProviderStamps(models.Model):
                            'carrier_price': 0.0})
         except WebFault as e:
             raise ValidationError(e)
+
+    def stamps_rate_shipment_multi(self, order=None, picking=None):
+        self.ensure_one()
+        date_planned = fields.Datetime.now()
+        if self.env.context.get('date_planned'):
+            date_planned = self.env.context.get('date_planned')
+        res = []
+        service = self._get_stamps_service()
+        shipping = self._get_stamps_shipping_multi(service, date_planned, order=order, picking=picking)
+        rates = service.get_rates(shipping)
+        for rate in rates:
+            price = float(rate.Amount)
+            if order:
+                currency = order.currency_id
+            else:
+                currency = picking.sale_id.currency_id if picking.sale_id else picking.company_id.currency_id
+            if currency.name != 'USD':
+                quote_currency = self.env['res.currency'].search([('name', '=', 'USD')], limit=1)
+                price = quote_currency.compute(rate.Amount, currency)
+
+            delivery_days = rate.DeliverDays
+            if delivery_days.find('-') >= 0:
+                delivery_days = delivery_days.split('-')
+                transit_days = int(delivery_days[-1])
+            else:
+                transit_days = int(delivery_days)
+            date_delivered = None
+            if transit_days > 0:
+                date_delivered = self.calculate_date_delivered(date_planned, transit_days)
+            service_code = rate.ServiceType
+            carrier = self.stamps_find_delivery_carrier_for_service(service_code)
+            if carrier:
+                res.append({
+                    'carrier': carrier,
+                    'success': True,
+                    'price': price,
+                    'error_message': False,
+                    'warning_message': False,
+                    'transit_days': transit_days,
+                    'date_delivered': date_delivered,
+                    'date_planned': date_planned,
+                    'service_code': service_code,
+                })
+        if not res:
+            res.append({
+                'success': False,
+                'price': 0.0,
+                'error_message': 'No valid rates returned from Stamps.com',
+                'warning_message': False
+            })
+        return res
+
+    def stamps_find_delivery_carrier_for_service(self, service_code):
+        if self.stamps_service_type == service_code:
+            return self
+        # arbitrary decision, lets find the same user name
+        carrier = self.search([('stamps_username', '=', self.stamps_username),
+                               ('stamps_service_type', '=', service_code)
+                               ], limit=1)
+        return carrier