Maikel f04903bca0 Merge pull request #2493 from HugsDaniel/2433-change-from-simple-product-to-base-product ...

Reimplement Spree's simple_product in OFN factory

2018-07-31 07:40:42 +10:00

..

archive/features/consumer

Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated.

2018-05-04 11:52:08 -03:00

controllers

Merge pull request #2409 from mkllnk/2013-remove-scope-active_distributors

2018-07-18 10:38:19 +02:00

features

Merge branch 'master' into 2-0-stable

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

helpers

Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop

2018-04-09 18:47:17 +02:00

javascripts

Reset reverse when clicking another column to sort

2018-07-23 10:33:40 +10:00

jobs

Reload order before sending emails to ensure state is up to date

2018-07-05 19:26:12 +10:00

lib

Check authorisation before attempting to charge credit cards on order cycle close

2018-07-05 19:26:12 +10:00

mailers

Merge pull request #2030 from lin-d-hop/uk/1663variant-order-emails

2018-03-23 15:29:05 +01:00

models

Merge branch 'master' into 2-0-stable

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

performance

Revert "Refactor Order#current_order argument"

2018-06-05 18:42:41 +02:00

requests

Move logic from ApplicationController to service and improve clarity

2018-06-20 01:28:35 +01:00

serializers

Make admin serialiser specs runnable on their own

2018-07-10 09:59:00 +10:00

services

Update attribute that errors are added to from credit_card to payment_method

2018-07-05 19:26:12 +10:00

support

Remove unnecessary expectation

2018-07-19 10:45:33 +10:00

views/json

Removing stupid unusable spec

2015-04-09 17:20:31 +10:00

factories.rb

Removed empty line

2018-07-30 12:11:02 +02:00

spec_helper.rb

Merge branch 'master' into 2-0-stable

2018-06-22 13:23:18 +02:00