Commit Graph

3379 Commits

Author SHA1 Message Date
Rohan Mitchell
ff28da345d Find variant overrides for some hubs 2014-12-12 13:33:12 +11:00
Rohan Mitchell
91b386003a Add VariantOverrideSerializer 2014-12-12 13:33:12 +11:00
Rohan Mitchell
a3a3832c8d Only show products that the chosen hub can add to an order cycle 2014-12-12 13:33:12 +11:00
Rohan Mitchell
500b5ce347 Enterprise managers can access override variants 2014-12-12 13:33:12 +11:00
Rohan Mitchell
5b82fcaca7 Inject hub permissions - which producers each hub can add to order cycle 2014-12-12 13:33:12 +11:00
Rob Harrington
3a9c4e0826 Adding a price without fees column to the order cycle customer report 2014-12-12 12:00:15 +11:00
Rob Harrington
6a226e4f92 Fixing typos and changing delivery address display in order confirmation email 2014-12-12 12:00:15 +11:00
Rohan Mitchell
086f69ccfb Default payment method server/test_mode to live 2014-12-12 11:35:18 +11:00
Rohan Mitchell
e607c9855f Add Pin Payments gateway 2014-12-12 10:59:23 +11:00
Rob Harrington
b9011d9abe Remove obsolete spree checkout views 2014-12-11 16:17:15 +11:00
Rob Harrington
b7810df346 Revert "Removing obsolete checkout views"
This reverts commit d0e013c1a5.
2014-12-11 16:09:17 +11:00
Rob Harrington
dfb9e5bde5 Order reports now present the price of line items with adjustments included 2014-12-11 15:48:29 +11:00
Rob Harrington
3be437485a Redirecting any spree checkout_state redirects to our checkout controller 2014-12-11 14:53:11 +11:00
Rob Harrington
d0e013c1a5 Removing obsolete checkout views 2014-12-11 14:50:29 +11:00
Rohan Mitchell
95f8334370 Reinstate style 2014-12-03 12:28:22 +11:00
Rohan Mitchell
50e26ed96f Remove old required partial 2014-12-03 12:22:43 +11:00
Rohan Mitchell
e30021537a Merge branch 'master' into enterprise-form-required-fields
Conflicts:
	app/views/admin/enterprises/_form.html.haml
	app/views/admin/enterprises/_ng_form.html.haml
2014-12-03 12:20:52 +11:00
Rohan Mitchell
3358fb3d73 Name based on meaning instead of context 2014-12-03 09:39:36 +11:00
Paul Mackay
26bca0faf8 Localize more strings on home page. 2014-12-03 09:39:36 +11:00
Paul Mackay
73ece4075c Add rails-i18n gem. 2014-12-03 09:39:35 +11:00
Rob Harrington
699c9a62a5 Removing pretty_inspect so that bugsnag alert work on production 2014-11-27 16:39:14 +11:00
Rob Harrington
5799f09caf Merge branch 'master' into pretty-emails 2014-11-27 00:02:44 +11:00
Rob Harrington
258573f5a6 Remove obsolete text version of user signup_confirmation 2014-11-26 18:58:26 +11:00
Rob Harrington
0cf2df8358 Remove obsolete text version of order confirm_email 2014-11-26 18:54:50 +11:00
Rob Harrington
8a3bffb37d Cart page conforms to convention in rest of checkout, adjusting helpers through checkout 2014-11-26 18:53:29 +11:00
Rob Harrington
8f27c643f1 Move override for cart line item into existing view replacement 2014-11-26 16:08:53 +11:00
Rob Harrington
a8dde3bbb9 Moving shopfront trial progress bar logic into enterprises helper and dealing with expiry 2014-11-26 15:16:53 +11:00
Rob Harrington
f5acf36771 Hiding enterprise shop url in ent welcome email, as that may bot actually make sense 2014-11-26 14:50:19 +11:00
Rob Harrington
17a2e37eda Fixing broken category lookup on BPE 2014-11-26 13:16:29 +11:00
Rob Harrington
f6b0863279 Make cost breakdowns consistent throughout checkout 2014-11-26 13:07:40 +11:00
Rob Harrington
c4961d2502 Whitespace crusader 2014-11-26 11:59:22 +11:00
Rob Harrington
9bd3909449 Merge master into pretty-emails 2014-11-21 14:43:01 +11:00
Rob Harrington
2f28312f7e Removing incorrectly placed directive in profile shops skinny view 2014-11-21 14:18:22 +11:00
Rohan Mitchell
49d5cb2f05 Do not show Override Variants tab - hide this until feature is ready 2014-11-21 13:49:09 +11:00
Rohan Mitchell
0b030a85ff Incrementally load products 2014-11-21 13:49:09 +11:00
Rohan Mitchell
001bf999d0 Extract Spree API authorisation to service 2014-11-21 13:49:09 +11:00
Rohan Mitchell
824b00743e Extract fetch-by-page from BPE to service 2014-11-21 13:49:09 +11:00
Rohan Mitchell
58fdc48b9f Display products in table 2014-11-21 13:49:09 +11:00
Rohan Mitchell
7069b30e71 Add indexer service (equivalent of Dereferencer, but named more accurately) 2014-11-21 13:49:09 +11:00
Rohan Mitchell
680ba379c1 User can select a hub 2014-11-21 13:49:09 +11:00
Rohan Mitchell
912c60f720 Do not show producers in hubs list 2014-11-21 13:49:09 +11:00
Rohan Mitchell
2c74a94e31 Show list of hubs to select for managing variant overrides 2014-11-21 13:49:09 +11:00
Rohan Mitchell
f9b4c07219 Add initial VariantOverride model with price lookup 2014-11-21 13:49:09 +11:00
Rob Harrington
5e3f1e4a3b Adding bugsnag notifier to work out what is happening with bug when adding variants to order 2014-11-21 12:37:56 +11:00
Rob Harrington
04b065e28a Orders page doesn't crash when orders have no distributor 2014-11-21 10:15:40 +11:00
Rohan Mitchell
5eb40261a8 Port clone products specs to BulkProducts service specs 2014-11-21 08:41:41 +11:00
Rohan Mitchell
7e4d337773 Extract DisplayProperties to a service
Conflicts:

	app/assets/javascripts/admin/bulk_product_update.js.coffee
2014-11-21 08:41:41 +11:00
Rohan Mitchell
356a03ac4e WIP: Extract bulk product edit product management to BulkProducts service
Conflicts:

	app/assets/javascripts/admin/bulk_product_update.js.coffee
2014-11-21 08:41:41 +11:00
Rohan Mitchell
f117c0cd24 Make spree_current_user available to serializers as 'scope' 2014-11-21 08:41:41 +11:00
Rohan Mitchell
29e49b67cc In BPE, rename producer and category JSON attrs to producer_id and category_id
Conflicts:

	spec/features/admin/bulk_product_update_spec.rb
2014-11-21 08:41:41 +11:00