Commit Graph

809 Commits

Author SHA1 Message Date
Rohan Mitchell
ea17e475a6 When viewing enterprise fees, only show those for the enterprise I select 2013-10-18 14:44:01 +11:00
Rohan Mitchell
91f14dcd4c Enterprise manager can create/edit enterprise fees 2013-10-18 13:56:22 +11:00
Rohan Mitchell
3b5e6f5742 When viewing shipping methods, only show those for the distributor I select 2013-10-18 10:01:11 +11:00
Rohan Mitchell
c07c52085a Enterprise user can view and create shipping methods 2013-10-18 09:35:53 +11:00
Rohan Mitchell
e6041aaf2f Enterprise user can view, create and edit payment methods 2013-10-18 09:09:53 +11:00
Rohan Mitchell
358ca25f31 Admin can assign multiple distributors to a shipping method 2013-10-17 11:16:26 +11:00
Rohan Mitchell
93cb845ee2 DB and model changes to make ShippingMethod distributor habtm 2013-10-17 11:15:43 +11:00
Rohan Mitchell
de8d7bd66e Clean up payment methods form 2013-10-17 11:08:25 +11:00
Rohan Mitchell
e29497c5b4 Enterprise users can bulk edit inactive products 2013-10-16 16:57:20 +11:00
Rohan Mitchell
751801653e Bulk product update with >25 products succeeds 2013-10-16 14:36:22 +11:00
Rohan Mitchell
631bc631fb Do not show order cycle debug info in production 2013-10-16 10:39:32 +11:00
Rohan Mitchell
a6877c6981 Only render calculator HTML in enterprise fee JSON if explicitly requested. Improves load time of order cycles page. 2013-10-16 10:37:09 +11:00
Rohan Mitchell
4b7fc8b5e4 In production, redirect to hostname with the SSL certificate 2013-10-14 10:44:14 +11:00
Rohan Mitchell
30bc45370b When order cycle expires mid-order, clear the order cycle and display a message 2013-09-30 16:56:11 +10:00
Rohan Mitchell
f5b56617a0 As an enterprise user, when I create an enterprise, I should have management permission for it 2013-09-30 11:10:20 +10:00
Rohan Mitchell
1d4198d402 Removing a supplier exchange removes variants from distribution 2013-09-30 09:46:39 +10:00
Rohan Mitchell
01036ec730 Add LineItem#supplied_by scope, fixes orders and fulfillment report supplier filtering 2013-09-27 14:11:12 +10:00
Rohan Mitchell
dac49d1044 Order cycle-aware pickup time 2013-09-27 11:17:24 +10:00
Rohan Mitchell
68fe20c37a Add scope: Exchange.with_product 2013-09-23 17:39:16 +10:00
Rohan Mitchell
44aac294e0 Merge branch 'issue14' 2013-09-23 15:39:13 +10:00
Rohan Mitchell
19349c805f Destroy supplied products when a supplier is destroyed 2013-09-23 14:58:26 +10:00
Rohan Mitchell
450a1e49c2 Do not 500 when add to cart fails 2013-09-23 14:15:53 +10:00
Rohan Mitchell
741a81a427 Fix spec fails - do not redirect on Products#show when distributor not set 2013-09-23 14:00:33 +10:00
Rohan Mitchell
072ce67b78 Redirect if distributor not chosen 2013-09-23 13:39:13 +10:00
Rohan Mitchell
000b13782e Remove taxon crumbs, since taxon view is not yet supported and produces errors 2013-09-23 11:06:02 +10:00
Rohan Mitchell
803594b4d7 Confirm change hub when it would empty cart 2013-09-23 10:07:25 +10:00
Rohan Mitchell
767478a0ee Add link to change hub 2013-09-23 09:17:17 +10:00
Rob H
8831dfc660 Fix #42 2013-09-20 14:28:46 +05:45
Rob H
08eb865469 Increase pagination size for products in BPE, resolves #14 2013-09-20 13:25:07 +05:45
Rohan Mitchell
9811851e29 Comment out order cycles debug styling that breaks tests 2013-09-20 13:08:54 +10:00
Rohan Mitchell
d100d12ebe When a variant is removed from supply to an order cycle, remove it from distribution also 2013-09-20 11:11:59 +10:00
Rohan Mitchell
00fe10e847 Reposition order cycle admin debug info 2013-09-20 09:29:26 +10:00
Rohan Mitchell
4956a4e384 Only geocode addresses associated with enterprises. Makes Checkout#update much faster. 2013-09-19 16:56:48 +10:00
David Cook
0183b0f2c1 Fix bulk update of order cycles for enterprise users 2013-09-19 15:48:39 +10:00
David Cook
2df2096d74 Sort payment and shipping methods by distributor name 2013-09-19 15:21:14 +10:00
David Cook
2e13abf933 Show only orders I am distributing 2013-09-19 15:21:14 +10:00
Rohan Mitchell
c9e543b25a Update delivery page of checkout, change shipping to delivery 2013-09-19 13:40:49 +10:00
David Cook
e4127358c3 Rearrange admin payment methods table (BH#73) 2013-09-19 12:12:50 +10:00
David Cook
402ed01207 Refactor/cleanup 2013-09-19 12:12:50 +10:00
Rohan Mitchell
08941ae22b Data integrity 2013-09-19 11:22:55 +10:00
Rohan Mitchell
dc9206ccf6 Re-arrange top nav area 2013-09-18 16:27:18 +10:00
David Cook
b544c3a4f9 Add distributor column to admin shipping methods and payment methods pages 2013-09-18 13:48:50 +10:00
David Cook
42a31ccd74 Show all relevant suppliers and distributors in report drop-down 2013-09-18 12:34:44 +10:00
David Cook
ad4301df90 Add supplier selection to Orders & Fulfillment Report 2013-09-18 12:34:43 +10:00
David Cook
4c2d6b38ea Ensure 'No Order Cycle' remains selected after clicking 'Search' 2013-09-18 09:57:03 +10:00
David Cook
b34d940457 Renamed report column to 'Curr. Cost per Unit' for clarity 2013-09-18 09:27:34 +10:00
David Cook
3fbd5dc625 Fix 'No Order Cycle' dropdown in Orders & Fulfillment Reports 2013-09-18 09:27:34 +10:00
David Cook
9782dd8264 Get line item cost from order, not current product price which may have changed. Also removed unnecessary total columns. 2013-09-18 09:27:34 +10:00
David Cook
e57ad81934 Add 'No Order Cycle' option and cycle dates to dropdown in Orders & Fulfillment Reports 2013-09-18 09:27:34 +10:00
David Cook
5ec3c1831d Only show order cycles that the user has access to in reports drop-down 2013-09-18 09:26:50 +10:00