aboutsummaryrefslogtreecommitdiffstats
path: root/servo/urls
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2015-11-19 22:55:58 +0200
committerFilipp Lepalaan <filipp@mac.com>2015-11-19 22:55:58 +0200
commit72111556edd4c108033e454758434df63045c0b0 (patch)
treec02fb2dbb42f4ce420e1dd93753c0ae5bf806a44 /servo/urls
parent693697ea725b040f04dcd166f53f495ba6049eaa (diff)
downloadServo-72111556edd4c108033e454758434df63045c0b0.tar.gz
Servo-72111556edd4c108033e454758434df63045c0b0.tar.bz2
Servo-72111556edd4c108033e454758434df63045c0b0.zip
Cleanup
Diffstat (limited to 'servo/urls')
-rw-r--r--servo/urls/order.py13
-rw-r--r--servo/urls/products.py27
2 files changed, 28 insertions, 12 deletions
diff --git a/servo/urls/order.py b/servo/urls/order.py
index c2a49a6..96c34f8 100644
--- a/servo/urls/order.py
+++ b/servo/urls/order.py
@@ -66,10 +66,12 @@ urlpatterns = patterns(
url(r'^create/product/(?P<product_id>\d+)/$', 'create',
name="orders-create_with_product"),
- url(r'^create/note/(?P<note_id>\d+)/$', 'create', name="orders-create_with_note"),
+ url(r'^create/note/(?P<note_id>\d+)/$', 'create',
+ name="orders-create_with_note"),
url(r'^create/device/(?P<device_id>\d+)/$', 'create',
name='orders-create_with_device'),
- url(r'^create/sn/(?P<sn>\w+)?/$', 'create', name='orders-create_with_sn'),
+ url(r'^create/sn/(?P<sn>\w+)?/$', 'create',
+ name='orders-create_with_sn'),
url(r'^create/customer/(?P<customer_id>\d+)?/$', 'create',
name="orders-create_with_customer"),
@@ -85,8 +87,11 @@ urlpatterns = patterns(
name='orders-remove_product'),
url(r'^(?P<pk>\d+)/products/(?P<product_id>\d+)/add/$', 'add_product',
name="orders-add_product"),
- url(r'^(?P<pk>\d+)/devices/(?P<device>\d+)/parts/(?P<code>[\w\-/]+)/add/$', 'add_part', name="orders-add_part"),
- url(r'^(?P<pk>\d+)/devices/(?P<device>\d+)/history/$', 'history', name="orders-history"),
+ url(r'^(?P<pk>\d+)/devices/(?P<device>\d+)/parts/(?P<code>[\w\-/]+)/add/$',
+ 'add_part',
+ name="orders-add_part"),
+ url(r'^(?P<pk>\d+)/devices/(?P<device>\d+)/history/$', 'history',
+ name="orders-history"),
url(r'^(?P<pk>\d+)/products/(?P<item_id>\d+)/report/$', 'report_product',
name="orders-report_product"),
url(r'^(?P<pk>\d+)/devices/(?P<device_id>\d+)/report/$', 'report_device',
diff --git a/servo/urls/products.py b/servo/urls/products.py
index 9c60baa..c17b082 100644
--- a/servo/urls/products.py
+++ b/servo/urls/products.py
@@ -6,11 +6,19 @@ urlpatterns = patterns(
"servo.views.product",
url(r'^tags/$', "tags", name="products-tags"),
- url(r'^all/$', "list_products", {'group': 'all'}, name="products-list_products"),
- url(r'^download/$', "download_products", name="products-download"),
- url(r'^upload/$', "upload_products", name="products-upload_products"),
- url(r'^upload/parts/$', "upload_gsx_parts", name="products-upload_gsx_parts"),
- url(r'^update_price/(\d+)/$', "update_price", name="products-update_price"),
+ url(r'^all/$', "list_products", {'group': 'all'},
+ name="products-list_products"),
+ url(r'^download/$', "download_products",
+ name="products-download"),
+ url(r'^inventory_report/$', "get_inventory_report",
+ name="products-get_inventory_report"),
+
+ url(r'^upload/$', "upload_products",
+ name="products-upload_products"),
+ url(r'^upload/parts/$', "upload_gsx_parts",
+ name="products-upload_gsx_parts"),
+ url(r'^update_price/(\d+)/$', "update_price",
+ name="products-update_price"),
url(r'^all/(?P<pk>\d+)/$', "view_product", {'group': 'all'},
name="products-view_product"),
@@ -18,7 +26,8 @@ urlpatterns = patterns(
name="products-view_product"),
# Editing product categories
- url(r'^categories/create/$', "edit_category", name="products-create_category"),
+ url(r'^categories/create/$', "edit_category",
+ name="products-create_category"),
url(r'^categories/(?P<slug>[\w\-]+)/edit/$', "edit_category",
name="products-edit_category"),
url(r'^categories/(?P<slug>[\w\-]+)/delete/$', "delete_category",
@@ -28,7 +37,8 @@ urlpatterns = patterns(
# Editing products
url(r'^create/$', "edit_product", name="products-create"),
- url(r'^(?P<group>[\w\-]+)/create/$', "edit_product", name="products-create"),
+ url(r'^(?P<group>[\w\-]+)/create/$', "edit_product",
+ name="products-create"),
url(r'^(?P<group>[\w\-/]*)/(?P<pk>\d+)/edit/$', "edit_product",
name="products-edit_product"),
url(r'^(?P<group>[\w\-/]*)/(?P<pk>\d+)/delete/$', "delete_product",
@@ -49,5 +59,6 @@ urlpatterns = patterns(
"get_info",
name="products-get_info"),
- url(r'^(?P<group>[\w\-]+)/$', "list_products", name="products-list_products"),
+ url(r'^(?P<group>[\w\-]+)/$', "list_products",
+ name="products-list_products"),
)