Merge branch '13.0' of gitee.com:jone/oejia_weshop_p into 13.0

JoneXiong · Mar 28, 2023 · 5dc5031 · 5dc5031
2 parents 379d9f3 + 5198cde
commit 5dc5031
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/controllers/__init__.py b/controllers/__init__.py
@@ -46,11 +46,11 @@ def get_request(self, httprequest):
             return HttpRequest(httprequest)
     root.get_request = MethodType(get_request, root)
 
-origin_get_response = root.get_response
-def get_response(self, httprequest, result, explicit_session):
-    response = origin_get_response(httprequest, result, explicit_session)
-    if hasattr(response, 'headers') and response.headers.get('set-sid'):
-        response.headers.set('set-sid', httprequest.session.sid)
-    return response
-root.get_response = MethodType(get_response, root)
+    origin_get_response = root.get_response
+    def get_response(self, httprequest, result, explicit_session):
+        response = origin_get_response(httprequest, result, explicit_session)
+        if hasattr(response, 'headers') and response.headers.get('set-sid'):
+            response.headers.set('set-sid', httprequest.session.sid)
+        return response
+    root.get_response = MethodType(get_response, root)
 
diff --git a/controllers/order.py b/controllers/order.py
@@ -83,8 +83,11 @@ def create(self, sub_domain, **kwargs):
             }
             order_dict.update(kwargs)
             if kwargs.get('extraInfo'):
-                extraInfo = json.loads(kwargs.get('extraInfo'))
-                order_dict.update(extraInfo)
+                try:
+                    extraInfo = json.loads(kwargs.get('extraInfo'))
+                    order_dict.update(extraInfo)
+                except:
+                    import traceback;traceback.print_exc()
             order_dict['_params'] = {'calculate': calculate, 'isNeedLogistics': isNeedLogistics}
             order_dict['_params'].update(kwargs)
             _logger.info('>>> order_dict %s', order_dict)
@@ -138,7 +141,8 @@ def create(self, sub_domain, **kwargs):
 
                 #mail_template = request.env.ref('wechat_mall_order_create')
                 #mail_template.sudo().send_mail(order.id, force_send=True, raise_exception=False)
-                order.action_accounted(order_dict)
+                if hasattr(order, 'action_accounted'):
+                    order.action_accounted(order_dict)
                 order.action_created(order_dict)
                 _data = {
                     "amountReal": round(order.amount_total, 2),

diff --git a/models/sale_order.py b/models/sale_order.py
@@ -95,6 +95,9 @@ def delivery_window(self):
 
     @api.multi
     def action_paid(self):
+        '''
+        将订单置为已支付(电商)
+        '''
         self.write({'customer_status': 'pending', 'is_paid': True})
 
     @api.multi

diff --git a/views/wxapp_payment_views.xml b/views/wxapp_payment_views.xml
@@ -12,14 +12,9 @@
                <field name="wechat_user_id"/>
                <field name="payment_number"/>
                <field name="price" sum="合计" widget="monetary"/>
-               <field name="cash_fee"/>
                <field name="cash_fee_type"/>
-               <field name="coupon_count"/>
-               <field name="coupon_fee"/>
                <field name="fee_type"/>
                <field name="result_code"/>
-               <field name="settlement_total_fee"/>
-               <field name="total_fee"/>
                <field name="transaction_id"/>
                <field name="status"/>
                 </tree>