Merge branch 'master' into aeolus

myapps/automat/api/hatch_portal.py

@@ -39,7 +39,7 @@ def get_production_list():
                 "machine_no": i.machine_no,
                 "hatch_no": [i.hatch_no],
                 "production_id": i.production_id,
-                "name": i.name,
+                "name": i.production,
                 "title": i.title,
                 "brand_id": i.brand_id,
                 "brand_name": i.brand_name,
@@ -79,7 +79,7 @@ def get_production_info():
         "machine_no": hatch_info.machine_no,
         "hatch_no": hatch_info.hatch_no,
         "production_id": hatch_info.production_id,
-        "name": hatch_info.name,
+        "name": hatch_info.production,
         "title": hatch_info.title,
         "brand_id": hatch_info.brand_id,
         "brand_name": hatch_info.brand_name,

myapps/automat/api/rent_portal.py

@@ -106,7 +106,7 @@ def create_rent():
             rent_detail.machine_no = rent.machine_no
             rent_detail.hatch_no = open_hatch.hatch_no
             rent_detail.production_id = open_hatch.production_id
-            rent_detail.name = open_hatch.name
+            rent_detail.name = open_hatch.production_name
             rent_detail.title = open_hatch.title
             rent_detail.brand_id = open_hatch.brand_id
             rent_detail.brand_name = open_hatch.brand_name
@@ -262,7 +262,7 @@ def wx_pay_callback():
             rent_detail.machine_no = rent.machine_no
             rent_detail.hatch_no = i.hatch_no
             rent_detail.production_id = i.production_id
-            rent_detail.name = i.name
+            rent_detail.name = i.production_name
             rent_detail.title = i.title
             rent_detail.brand_id = i.brand_id
             rent_detail.brand_name = i.brand_name
@@ -318,7 +318,7 @@ def get_rent_detail():
         tmp_data["hatch_no"] = i.hatch_no
         tmp_data["production_id"] = i.production_id
         tmp_data["is_take"] = i.is_take
-        tmp_data["name"] = i.name
+        tmp_data["name"] = i.production_name
         tmp_data["title"] = i.title
         tmp_data["brand_id"] = i.brand_id
         tmp_data["brand_name"] = i.brand_name
@@ -356,7 +356,7 @@ def get_user_detail_record():
         tmp_data["hatch_no"] = i.hatch_no
         tmp_data["production_id"] = i.production_id
         tmp_data["is_take"] = i.is_take
-        tmp_data["name"] = i.name
+        tmp_data["name"] = i.production_name
         tmp_data["title"] = i.title
         tmp_data["brand_id"] = i.brand_id
         tmp_data["brand_name"] = i.brand_name