Merge branch 'master' into 3-0-stable-may13

This commit is contained in:
Luis Ramos
2020-05-13 19:50:32 +01:00
182 changed files with 2432 additions and 729 deletions

View File

@@ -26,7 +26,7 @@ class ShippingMethodFactory
def create_pickup(enterprise)
create_shipping_method(
enterprise,
name: "Pickup",
name: "Pickup #{enterprise.name}",
description: "pick-up at your awesome hub gathering place",
require_ship_address: false,
calculator_type: "Calculator::Weight"
@@ -36,7 +36,7 @@ class ShippingMethodFactory
def create_delivery(enterprise)
delivery = create_shipping_method(
enterprise,
name: "Home delivery",
name: "Home delivery #{enterprise.name}",
description: "yummy food delivered at your door",
require_ship_address: true,
calculator_type: "Spree::Calculator::FlatRate"