Преглед на файлове

Fixed calculation bug with range upload stats

master
David Winterbottom преди 13 години
родител
ревизия
5a05f223ee
променени са 2 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 3
    3
      oscar/apps/dashboard/ranges/models.py
  2. 2
    2
      oscar/templates/dashboard/ranges/range_product_list.html

+ 3
- 3
oscar/apps/dashboard/ranges/models.py Целия файл

@@ -73,10 +73,10 @@ class RangeProductFileUpload(models.Model):
73 73
         found_skus = set(products.values_list('stockrecord__partner_sku', flat=True))
74 74
         found_upcs = set(products.values_list('upc', flat=True))
75 75
         found_ids = found_skus.union(found_upcs)
76
-        missing_skus = new_ids - found_ids
77
-        dupes = set(all_ids).intersection(existing_skus)
76
+        missing_ids = new_ids - found_ids
77
+        dupes = set(all_ids).intersection(existing_ids)
78 78
 
79
-        self.mark_as_processed(len(found_skus), len(missing_skus), len(dupes))
79
+        self.mark_as_processed(len(found_ids), len(missing_ids), len(dupes))
80 80
 
81 81
     def extract_ids(self):
82 82
         """

+ 2
- 2
oscar/templates/dashboard/ranges/range_product_list.html Целия файл

@@ -51,7 +51,7 @@ Products in range '{{ range.name }}' | {{ block.super }}
51 51
 				<tr>
52 52
 					<th>Filename</th>
53 53
 					<th>New products</th>
54
-					<th>Dupliate products</th>
54
+					<th>Duplicate products</th>
55 55
 					<th>Unknown products</th>
56 56
 					<th>Date uploaded</th>
57 57
 				</tr>
@@ -61,8 +61,8 @@ Products in range '{{ range.name }}' | {{ block.super }}
61 61
 				<tr>
62 62
 					<td>{{ upload.filename }}</td>
63 63
 					<td>{{ upload.num_new_skus }}</td>
64
-					<td>{{ upload.num_unknown_skus }}</td>
65 64
 					<td>{{ upload.num_duplicate_skus }}</td>
65
+					<td>{{ upload.num_unknown_skus }}</td>
66 66
 					<td>{{ upload.date_uploaded }}</td>
67 67
 				</tr>
68 68
 				{% endfor %}

Loading…
Отказ
Запис