|
|
|
@ -82,9 +82,9 @@ class DPDeliveryCarrier(models.Model):
|
|
|
|
|
service = self.sudo().dp_service_type
|
|
|
|
|
im = self.conn_auth_im()
|
|
|
|
|
im_recipient = self.build_im_addr(im, recipient)
|
|
|
|
|
im_sender = self.build_im_addr(im, wareohouse)
|
|
|
|
|
im_sender = self.build_im_addr(im, warehouse)
|
|
|
|
|
service = self.sudo().dp_service_type
|
|
|
|
|
position = im.build_position(service_type.code, im_sender, im_recipient)
|
|
|
|
|
position = im.build_position(service.code, im_sender, im_recipient)
|
|
|
|
|
im.add_position(position)
|
|
|
|
|
r = im.checkoutPNG()
|
|
|
|
|
voucher = r.shoppingCart.voucherList.voucher[0]
|
|
|
|
@ -96,7 +96,7 @@ class DPDeliveryCarrier(models.Model):
|
|
|
|
|
'voucher_id' : voucher.voucherId,
|
|
|
|
|
'order_id' : r.shoppingCart.shopOrderId,
|
|
|
|
|
'wallet_balance': r.walletBalance,
|
|
|
|
|
'attachments': [(filename, voucher.png_bin)]},
|
|
|
|
|
'attachments': [(filename, voucher.png_bin)]}
|
|
|
|
|
return result
|
|
|
|
|
|
|
|
|
|
def dp_get_shipping_price_from_so(self, order):
|
|
|
|
|