Maikel c510bbd8d0 Merge pull request #2589 from luisramos0/spree2_base_mailer_dec_update ...

Spree 2 Upgrade - MailMethod - Delete outdated base_mailer_decorator.from_address

2018-09-03 11:05:48 +10:00

..

assets

Merge branch 'master' into 2-0-stable

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

controllers

Style recently merged code

2018-07-26 10:52:56 +10:00

helpers

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

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

jobs

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

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

mailers

Delete outdated base_mailer_decorator.from_address (it used old MailMethod). This way we rely on the correct spree base_mailer.from_address (that gets it from Spree::Config

2018-08-25 13:47:05 +01:00

models

Fixed bulk_line_items_controller_spec by setting shipment on test line_items and by allowing shipment decorator to allow no adjustments in the shipment

2018-08-22 23:20:30 +01:00

overrides

Remove spree product navigation override

2018-07-13 16:58:57 +10:00

presenters

Adding option to 'Inherit From Product' for enterprise_fee tax categories

2016-03-02 11:56:46 +11:00

serializers/api

Revert accidental copy and paste

2018-07-10 10:31:51 +10:00

services

Update attribute that errors are added to from credit_card to payment_method

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

validators

Fix failing tests and extract validation message Procs into methods

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

views

Merge pull request #2389 from luisramos0/bulk_prod_edit_fix

2018-07-26 14:09:21 +10:00