Pau Perez 43bf7293bf Merge branch 'master' into 2-0-stable ...

* master: (125 commits)
  Fix syntax error in GETTING_STARTED.md
  Fix syntax error in README.md
  Fix link syntax errors in REAME.md and GETTING_STARTED.md
  Style recently merged code
  Update gem i18n-js to pick up locale changes
  Fix embedded shopfront menu responsiveness
  Add communications links to README
  Fix script/setup by making it less clever
  Change import and reset logic to work with first page
  Move options to first page
  Fix wrong sort predicates in customer index
  Reset reverse when clicking another column to sort
  Move logic for toggling by column into SortOptions
  Generalize sorting through SortOptions service
  Remove unused sorting preferences in ColumnsCtrl
  Fix frontend sorting in "Bulk Order Management"
  Fix frontend sorting in "Customers" index
  Change sorting to be done in ascending order first
  Wrap rows in customer index with TBODY tag
  Update .rubocop_todo.yml
  ...

2018-07-27 10:21:47 +02:00

..

calculator

Use localize_number in models

2017-12-01 13:37:24 +11:00

open_food_network/calculator

Add missing translations on views

2017-05-04 21:33:17 +02:00

product_import

Change import and reset logic to work with first page

2018-07-23 02:07:00 +01:00

spree

Merge branch 'master' into 2-0-stable

2018-07-27 10:21:47 +02: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

cart.rb

Rubocop: Correct Lint/UselessAssignment offences, disable for /spec in main config

2017-06-23 16:49:08 +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

Replace references to 'standing order' with 'subscription'

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

content_configuration.rb

Fix Rubocop violations reported by Code Climate

2018-04-16 10:27:44 +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

Calculate price sack fees and tests

2018-04-04 11:25:25 +10: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

Use indented style for multiline method calls

2017-07-12 10:40:53 +02: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

Remove unused method enterprise method

2018-06-27 11:25:44 +10: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

Rubocop: Correct Lint/AmbiguousOperator offences

2017-06-23 16:49:08 +10:00

order_cycle_set.rb

Refactor loading of OrderCycleSet in OrderCyclesController

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

order_cycle.rb

Add validation of open and close dates for order cycles

2018-04-04 17:18:32 +10:00

order_updater.rb

Add doc to method

2018-07-25 13:52:05 +02: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

Alter scope to return both completed and resumed orders

2018-03-07 14:24:59 +11: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

Remove unrequired credit_card_id field from subscriptions table

2018-07-05 19:26:12 +10: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

PI inventories and overhaul

2018-05-26 19:34:19 +01:00