Maikel 1819fc8493 Merge pull request #3199 from luisramos0/2-0-stable-dec-10th ...

[Spree Upgrade] Merging master into 2-0-stable (second run in Dec2018)

2018-12-11 18:50:24 +11:00

..

calculator

Move Calculator::Weight from models/open_food_network/calculator to models/calculator

2018-11-07 09:54:30 +00:00

concerns

Merge pull request #2775 from luisramos0/2-0-checkout-ship-method

2018-12-11 11:59:03 +11:00

preference_sections

Refacto edit method for content controller and enable custom user guide link

2018-09-12 14:51:53 +02:00

product_import

Include unexpected validation errors

2018-11-21 19:16:07 +00:00

spree

Merge branch 'master' into 2-0-stable-dec-10th

2018-12-10 16:41:29 +00:00

stock

Skip methods that distributor can't use in Package

2018-05-02 13:58:25 +02:00

tag_rule

CalculatedAdjustments requires include first

2017-09-08 23:55:48 +10:00

.gitkeep

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

account_invoice.rb

Linking billable_periods to the relevant account_invoice upon creation

2015-09-17 22:38:29 +10:00

adjustment_metadata.rb

Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation

2013-08-12 10:00:35 +10:00

billable_period.rb

Adjustments now have state instead of locked/unlocked

2017-09-08 23:55:48 +10:00

column_preference_set.rb

Default column visibility can be set per user using ColumnPreferences model

2016-05-25 08:10:20 +10:00

column_preference.rb

Fix current violations of Style/Send cop

2018-09-05 12:05:05 +02:00

content_configuration.rb

Use explicit syntax for section objects in preference_sections definition

2018-09-13 12:34:06 +02:00

coordinator_fee.rb

Refresh products cache when coordinator fees are changed or destroyed

2016-02-24 15:05:03 +11:00

customer.rb

Load all shops that a user is associated with as a customer

2018-06-24 16:28:47 +10:00

distributor_shipping_method.rb

Adding tests and full touch behaviour for caching

2014-07-04 14:39:26 +10:00

enterprise_fee_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

enterprise_fee.rb

Move product distributions check as a before_destroy in EnterpriseFee model

2018-11-15 14:05:15 +01:00

enterprise_group.rb

Extract translations from models

2017-07-21 12:17:12 +10:00

enterprise_relationship_permission.rb

Style permission list items, order perms consistently by name

2014-08-25 15:05:49 +10:00

enterprise_relationship.rb

Add before_destroy to enterprise_relationship so that variant overrides are revoked when permission is deleted

2018-10-20 12:32:51 +01:00

enterprise_role.rb

Refactor enterprise contact user assignment

2018-02-07 10:41:53 +11:00

enterprise_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

enterprise.rb

Revert "Instagram pattern"

2018-11-09 13:33:11 +11:00

exchange_fee.rb

Refresh products cache when exchange fee is changed or destroyed

2016-02-24 15:05:03 +11:00

exchange_variant.rb

Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants

2012-11-26 11:03:44 +11:00

exchange.rb

Use indented style for multiline method calls

2017-07-12 10:40:53 +02:00

feature_flags.rb

Show product import's UI only to superadmins

2018-06-11 19:50:53 +02:00

inventory_item.rb

Extract translations from models

2017-07-21 12:17:12 +10:00

model_set.rb

Make ProductSet parseable by humans

2018-10-11 15:52:40 +02:00

order_cycle_set.rb

Refactor loading of OrderCycleSet in OrderCyclesController

2018-04-04 17:17:36 +10:00

order_cycle.rb

Merge pull request #2661 from kristinalim/translations-copy_of_order_cycle

2018-09-17 12:38:29 +02:00

order_updater.rb

Merge branch 'master' into 2-0-stable-oct

2018-10-15 17:09:26 +01:00

producer_property.rb

Property / ProducerProperty changes update supplier enterprise cache

2016-11-25 14:14:42 +11:00

product_distribution.rb

Adjustments now have state instead of locked/unlocked

2017-09-08 23:55:48 +10:00

proxy_order.rb

Fix current violations of Style/Send cop

2018-09-05 12:05:05 +02:00

schedule.rb

Use Time.zone.now instead of Time.now

2018-02-09 14:44:07 +11:00

stripe_account.rb

Allow destruction of StripeAccounts even if deauthorise request fails

2017-09-23 14:58:35 +10:00

subscription_line_item.rb

Add logic for calculator of fee estimates to SubscriptionEstimator

2018-03-02 10:11:26 +11:00

subscription.rb

Fix current violations of Style/Send cop

2018-09-05 12:05:05 +02:00

tag_rule.rb

Tag Rules can be rearranged in UI to set priority

2016-05-27 16:25:10 +10:00

variant_override_set.rb

Adding tags to variant overrides

2016-05-27 16:23:26 +10:00

variant_override.rb

Fix rubocop and transpec models/variant_override and its spec

2018-11-30 00:43:55 +00:00