enhance functionality of carrier_tracking
							parent
							
								
									1204f238cc
								
							
						
					
					
						commit
						68107851ee
					
				|  | @ -11,7 +11,7 @@ | ||||||
|     'support': 'andreas.osim@glaser-co.at', |     'support': 'andreas.osim@glaser-co.at', | ||||||
|     'website': 'https://www.tzaustria.at', |     'website': 'https://www.tzaustria.at', | ||||||
|     'depends': ['sale_stock',], |     'depends': ['sale_stock',], | ||||||
|     'data': ['views/delivery_carrier_track.xml',], |     'data': ['views/delivery_carrier_track.xml','views/delivery_carrier.xml',], | ||||||
|     'installable': True, |     'installable': True, | ||||||
|     'auto_install': False, |     'auto_install': False, | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -12,6 +12,7 @@ class TZCarrier(models.Model): | ||||||
|     _inherit = 'delivery.carrier' |     _inherit = 'delivery.carrier' | ||||||
| 
 | 
 | ||||||
|     delivery_type = fields.Selection(selection_add=[('TZCarrier', 'TZCarrier')]) |     delivery_type = fields.Selection(selection_add=[('TZCarrier', 'TZCarrier')]) | ||||||
|  |     tracking_url = fields.Char('Tracking URL',track_visibility='onchange') | ||||||
| 
 | 
 | ||||||
|     # ------------------------------------------------ # |     # ------------------------------------------------ # | ||||||
|     # Fixed price shipping, aka a very simple provider # |     # Fixed price shipping, aka a very simple provider # | ||||||
|  | @ -54,21 +55,30 @@ class TZCarrier(models.Model): | ||||||
|     def TZCarrier_get_tracking_link(self, picking): |     def TZCarrier_get_tracking_link(self, picking): | ||||||
| 
 | 
 | ||||||
|         lSearch = picking.carrier_tracking_ref |         lSearch = picking.carrier_tracking_ref | ||||||
| 
 |  | ||||||
|         if self.name == 'Weiss': |  | ||||||
|         if picking.carrier_tracking_ref == '?': |         if picking.carrier_tracking_ref == '?': | ||||||
|             lSearch = picking.origin |             lSearch = picking.origin | ||||||
|             TZLink = r'http://isis.gw-world.com/siprod/sixWeb.pStartApp?i_vcAction=SearchConLight&i_vcSearchKey=%s&i_vcAdd=Glaser&i_vclangid=DE' % lSearch | 
 | ||||||
|         elif self.name == 'DHL': |         if self.tracking_url: | ||||||
|             TZLink = r'https://www.dhl.at/en/express/tracking.html?AWB=%s&brand=DHL' % lSearch |             TZLink = self.tracking_url % lSearch | ||||||
|         elif self.name == 'Dachser': |  | ||||||
|             TZLink = r'http://partner.dachser.com/shp2/?wicket:interface=:5:pnlHead:frmHead:btnSearch::IActivePageBehaviorListener:0:-1&wicket:ignoreIfNotActive=true&random=0.35369399622175934&tfiSearch=%s' % lSearch |  | ||||||
|         elif self.name == 'DPD': |  | ||||||
|             TZLink = r'https://tracking.dpd.de/status/de_AT/parcel/%s' % lSearch |  | ||||||
|         else: |         else: | ||||||
|             TZLink = False |             TZLink = False | ||||||
|  | 
 | ||||||
|         return TZLink |         return TZLink | ||||||
| 
 | 
 | ||||||
|  |         # if self.name == 'Weiss': | ||||||
|  |         #     if picking.carrier_tracking_ref == '?': | ||||||
|  |         #         lSearch = picking.origin | ||||||
|  |         #     TZLink = r'http://isis.gw-world.com/siprod/sixWeb.pStartApp?i_vcAction=SearchConLight&i_vcSearchKey=%s&i_vcAdd=Glaser&i_vclangid=DE' % lSearch | ||||||
|  |         # elif self.name == 'DHL': | ||||||
|  |         #     TZLink = r'https://www.dhl.at/en/express/tracking.html?AWB=%s&brand=DHL' % lSearch | ||||||
|  |         # elif self.name == 'Dachser': | ||||||
|  |         #     TZLink = r'http://partner.dachser.com/shp2/?wicket:interface=:5:pnlHead:frmHead:btnSearch::IActivePageBehaviorListener:0:-1&wicket:ignoreIfNotActive=true&random=0.35369399622175934&tfiSearch=%s' % lSearch | ||||||
|  |         # elif self.name == 'DPD': | ||||||
|  |         #     TZLink = r'https://tracking.dpd.de/status/de_AT/parcel/%s' % lSearch | ||||||
|  |         # else: | ||||||
|  |         #     TZLink = False | ||||||
|  |         # return TZLink | ||||||
|  | 
 | ||||||
|     def TZCarrier_cancel_shipment(self, pickings): |     def TZCarrier_cancel_shipment(self, pickings): | ||||||
|     #    return True |     #    return True | ||||||
|          raise UserError('Derzeit nicht möglich!') |          raise UserError('Derzeit nicht möglich!') | ||||||
|  |  | ||||||
|  | @ -0,0 +1,22 @@ | ||||||
|  | <?xml version="1.0" encoding="utf-8"?> | ||||||
|  | <!-- Copyright 2018-Today datenpol gmbh(<http://www.datenpol.at>) | ||||||
|  |      License OPL-1 or later (https://www.odoo.com/documentation/user/11.0/legal/licenses/licenses.html#licenses). --> | ||||||
|  | 
 | ||||||
|  | <odoo> | ||||||
|  | 
 | ||||||
|  |     <record id="view_delivery_carrier_url_tz" model="ir.ui.view"> | ||||||
|  |         <field name="name">view_delivery_carrier_url_tz</field> | ||||||
|  |         <field name="model">delivery.carrier</field> | ||||||
|  |         <field name="inherit_id" ref="delivery.view_delivery_carrier_form"/> | ||||||
|  |         <field name="arch" type="xml"> | ||||||
|  |             <field name="delivery_type" position="after"> | ||||||
|  | <!--                <field name="tracking_url" placeholder="Tracking URL" class="oe_edit_only"/> --> | ||||||
|  |                 <div class="oe_edit_only"> | ||||||
|  |                     Tracking URL | ||||||
|  |                     <field name="tracking_url" string="Tracking URL" placeholder="Tracking URL"/> | ||||||
|  |                 </div> | ||||||
|  |             </field> | ||||||
|  |         </field> | ||||||
|  |     </record> | ||||||
|  | 
 | ||||||
|  | </odoo> | ||||||
		Loading…
	
		Reference in New Issue