Maikel
4adf332480
Auto-merged master into uk/trial-length on deployment.
2016-03-16 22:42:50 +11:00
Lynne Davis
a4efd3d44c
Adding configurable Shop Trial Length in business model
2016-03-16 11:35:31 +00:00
Maikel Linke
587d06dced
Merge remote-tracking branch 'origin/master' into groups
...
Conflicts:
db/schema.rb
2016-03-02 15:31:35 +11:00
Rob Harrington
4bf27982f4
Applying variant override permissions when they are added or removed
...
Also remove variant overrides with revoked permissions from the default scope
2016-03-02 12:10:49 +11:00
Rob Harrington
186d1c1f26
Revoking ability to create variant overrides via OC permission
2016-03-02 12:10:49 +11:00
Rob Harrington
b2657ddc72
Adding data migration to populate inventories of enterprises that are already using variant overrides
2016-03-02 12:10:49 +11:00
Rob Harrington
1d83809866
Bugfix: Spree::Variant#not_hidden_for scope was broken
...
Was getting confused by presence of inventory items for other enterprises when none existed for a given variant/enterprise combo
2016-03-02 12:10:22 +11:00
Rob Harrington
f280b96215
Hiding a variant from inventory prevents it being available on the shopfront
...
User preferences around inventory-only product selection immediately affect the shopfront
2016-03-02 12:10:22 +11:00
Rob Harrington
77e74c5642
OC Coordinators can opt to restrict products in an order cycle to those in their inventory only
2016-03-02 12:10:22 +11:00
Rob Harrington
f05f88c1cb
Adding global config to allow shop users to only select from inventory variants in OC interface
2016-03-02 12:10:22 +11:00
Rob Harrington
f06d909c23
WIP: Adding infrastructure to show/hide variants + overrides using inventory items
2016-03-02 12:10:22 +11:00
Rob Harrington
095b420997
WIP: Adding InventoryItem model for managing contents of inventories
2016-03-02 12:10:22 +11:00
Rob Harrington
59745fbc73
EnterpriseFees can inherit tax_category from product
2016-03-02 11:56:46 +11:00
Rob Harrington
caa8818f02
Adding option to 'Inherit From Product' for enterprise_fee tax categories
2016-03-02 11:56:46 +11:00
Rob Harrington
137003c671
Correct calculation of tax on EnterpriseFees with TaxRates where included_in_price=false
2016-03-02 11:56:46 +11:00
Maikel Linke
a7e3b2d9df
Update enterprise email tests
2016-02-24 16:21:18 +11:00
Maikel Linke
4feb7c893b
Introduce contact email address for enterprises
...
Add a new column email_address to enterprises.
Use this new field for public display of contact details.
The old field enterprise.email is still used internally.
It is still displayed on orders and emails sent to customers.
A new enterprise has the owner's email address by default now.
Fix GH #757
2016-02-24 15:14:07 +11:00
Rohan Mitchell
48b02db70d
Order cycles are undated unless they have both open and close dates defined
2016-02-05 09:27:25 +11:00
Rob Harrington
669642292b
Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub
2016-01-15 09:07:51 +11:00
Rob Harrington
0bbae19b41
Variant Overrides Index: User can manually reset inheritance
2016-01-15 09:07:51 +11:00
Steve Pettitt
e423e890e0
Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly
2016-01-15 09:07:50 +11:00
Rob Harrington
94785d4157
Fixing authorization for VariantOverridesController#bulk_reset
2016-01-15 09:07:49 +11:00
Rob Harrington
d01da727f0
Removing :bulk_update action from actions allowed on nil object, using collection_actions methods on controller instead
2016-01-15 09:07:49 +11:00
Steve Pettitt
0ee078e232
Added toggle to enable/disable reset stock. Updated specs
2016-01-15 09:07:48 +11:00
Steve Pettitt
34c603a9c3
Added angular service tests for variant overrides stock reset
2016-01-15 09:07:48 +11:00
Rob Harrington
53d97dab08
WIP: Adding view and routes for resetting variant_overrides count_on_hand
2016-01-15 09:07:48 +11:00
Rob Harrington
521f227f74
Adding sku and on_demand to VariantOverride
2016-01-13 18:49:33 +11:00
Rohan Mitchell
257b5a9eef
Move premature Spree::Order#update prevention up a level, for even greater efficiency gains
2016-01-07 12:09:57 +11:00
Rohan Mitchell
e24027a8d0
Speed up add to cart: Update the order once per fee calculation, rather than for every line item x fee
2016-01-07 10:52:36 +11:00
Continuous Integration
23b9dd5c71
Auto-merge from CI [skip ci]
2015-12-17 13:02:37 +11:00
Maikel Linke
bc6110c178
Re-defining in_distributor scope as method to allow chaining
2015-12-17 12:42:28 +11:00
Rob Harrington
e0da49e4df
Formatting dates for account invoices in rails time zone
2015-12-17 11:34:06 +11:00
Rob Harrington
bac4fcbd8f
Make sure that adjustments for billable periods have a valid order to attach to when creating/updating
2015-12-16 19:18:59 +11:00
Rob Harrington
ecd11702c3
Fixing up enterprise user account page
2015-12-16 19:18:59 +11:00
Rob Harrington
fe0652e243
When updating a line_item quantity from 0, final_weight_volume is recalculated from the variants unit value
2015-12-16 19:18:59 +11:00
Rob Harrington
76d4f74f6b
Ammending BillablePeriod spec to be ensure tax is charged correctly
2015-12-16 19:18:58 +11:00
Rob Harrington
ca3c464fda
Reorganising busines model config settings, moving account invoice tax rate in busines model config settings
2015-12-16 19:18:57 +11:00
Rob Harrington
85f61364f8
BillablePeriods use global config to calculate bills
2015-12-16 19:18:57 +11:00
Rob Harrington
58031408f1
Adding basic business model configuration variables to app config
2015-12-16 19:18:56 +11:00
Rob Harrington
befc558224
Pulling product_and_variant_name down into VariantAndLineItemNaming, renaming to product_and_full_name
...
Also allowing this method to be used in reports (Xero), to reflect appropriate name for weight/volume adjusted line items
2015-12-16 11:55:24 +11:00
Rob Harrington
c91f1301f0
Adding preferences to enterprises for sorting of order cycles in shopfront list
2015-12-16 11:55:23 +11:00
Continuous Integration
b7edf5e046
Auto-merge from CI [skip ci]
2015-12-16 10:58:03 +11:00
Maikel Linke
1d46c2febd
LettuceShare report: display only if count_on_hand > 0
...
Use the inventory of a distributor if selected.
2015-12-11 15:12:27 +11:00
Rohan Mitchell
80ebaece2d
Sort distribution choices by name
2015-12-11 13:06:57 +11:00
Continuous Integration
ae945ace9d
Auto-merge from CI [skip ci]
2015-12-11 11:09:54 +11:00
Maikel Linke
cd7721a127
Using date and time of current timezone
...
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
2015-12-10 11:38:41 +11:00
Rohan Mitchell
8d270e919f
Sort exchanges for display when editing an order cycle
2015-12-10 09:17:25 +11:00
Rohan Mitchell
ea6974d438
Add OrderCycle#supplied_variants
2015-12-10 09:17:25 +11:00
Maikel Linke
c4fb4a8510
Removing Suburbs from the code
...
Suburbs are not used any more. Removing the last code bits should avoid
confusion and save a tiny bit of test time.
2015-12-04 10:37:55 +11:00
Rohan Mitchell
d320b2e7d4
Merge branch 'fix-delayed-job' into combined/producer-emails-simplify_fix-delayed-job
2015-12-02 15:06:38 +11:00
