diff --git a/materio_subscriptions/materio_subscriptions.features.user_permission.inc b/materio_subscriptions/materio_subscriptions.features.user_permission.inc index 27e1070d..01ad13ee 100644 --- a/materio_subscriptions/materio_subscriptions.features.user_permission.inc +++ b/materio_subscriptions/materio_subscriptions.features.user_permission.inc @@ -216,16 +216,6 @@ function materio_subscriptions_user_default_permissions() { 'module' => 'node', ); - // Exported permission: 'manage store coupons'. - $permissions['manage store coupons'] = array( - 'name' => 'manage store coupons', - 'roles' => array( - 'administrator' => 'administrator', - 'root' => 'root', - ), - 'module' => 'uc_coupon', - ); - // Exported permission: 'manual payments'. $permissions['manual payments'] = array( 'name' => 'manual payments', @@ -322,15 +312,5 @@ function materio_subscriptions_user_default_permissions() { 'module' => 'uc_store', ); - // Exported permission: 'view store coupons'. - $permissions['view store coupons'] = array( - 'name' => 'view store coupons', - 'roles' => array( - 'administrator' => 'administrator', - 'root' => 'root', - ), - 'module' => 'uc_coupon', - ); - return $permissions; } diff --git a/materio_subscriptions/materio_subscriptions.info b/materio_subscriptions/materio_subscriptions.info index 1e8e2433..8fb6d316 100644 --- a/materio_subscriptions/materio_subscriptions.info +++ b/materio_subscriptions/materio_subscriptions.info @@ -16,7 +16,6 @@ dependencies[] = text dependencies[] = uc_attribute dependencies[] = uc_cart_links dependencies[] = uc_cmcic -dependencies[] = uc_coupon dependencies[] = uc_credit dependencies[] = uc_order dependencies[] = uc_payment @@ -63,7 +62,6 @@ features[user_permission][] = delete payments features[user_permission][] = edit any product content features[user_permission][] = edit orders features[user_permission][] = edit own product content -features[user_permission][] = manage store coupons features[user_permission][] = manual payments features[user_permission][] = process credit cards features[user_permission][] = unconditionally delete orders @@ -75,7 +73,6 @@ features[user_permission][] = view own invoices features[user_permission][] = view own orders features[user_permission][] = view payments features[user_permission][] = view reports -features[user_permission][] = view store coupons features[user_role][] = Adhérent features[user_role][] = Premium features[user_role][] = Utilisateur @@ -269,4 +266,5 @@ features[variable][] = uc_weight_format_kg features[variable][] = uc_weight_format_lb features[variable][] = uc_weight_format_oz features[variable][] = uc_weight_unit +features_exclude[dependencies][uc_coupon] = uc_coupon project path = sites/all/modules/features diff --git a/materio_subscriptions/materio_subscriptions.strongarm.inc b/materio_subscriptions/materio_subscriptions.strongarm.inc index d6fcad14..58b3218a 100644 --- a/materio_subscriptions/materio_subscriptions.strongarm.inc +++ b/materio_subscriptions/materio_subscriptions.strongarm.inc @@ -308,7 +308,7 @@ function materio_subscriptions_strongarm() { $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'uc_cap_coupon_auto_enabled'; - $strongarm->value = 1; + $strongarm->value = 0; $export['uc_cap_coupon_auto_enabled'] = $strongarm; $strongarm = new stdClass(); @@ -322,7 +322,7 @@ function materio_subscriptions_strongarm() { $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'uc_cap_coupon_enabled'; - $strongarm->value = 1; + $strongarm->value = 0; $export['uc_cap_coupon_enabled'] = $strongarm; $strongarm = new stdClass(); @@ -482,7 +482,7 @@ function materio_subscriptions_strongarm() { 'uc_check_mailing_street2' => '', 'uc_check_mailing_city' => 'Paris', 'uc_check_mailing_zone' => 0, - 'uc_check_mailing_country' => '124', + 'uc_check_mailing_country' => '250', 'uc_check_mailing_postal_code' => '75012', ); $export['uc_check_address'] = $strongarm; @@ -505,7 +505,7 @@ function materio_subscriptions_strongarm() { $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'uc_check_mailing_country'; - $strongarm->value = '124'; + $strongarm->value = '250'; $export['uc_check_mailing_country'] = $strongarm; $strongarm = new stdClass(); @@ -1163,7 +1163,7 @@ For your convenience, you are already logged in with your newly created account. $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'uc_payment_method_other_checkout'; - $strongarm->value = 1; + $strongarm->value = 0; $export['uc_payment_method_other_checkout'] = $strongarm; $strongarm = new stdClass(); @@ -1331,14 +1331,14 @@ For your convenience, you are already logged in with your newly created account. $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'uc_store_city'; - $strongarm->value = ''; + $strongarm->value = 'Paris'; $export['uc_store_city'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'uc_store_country'; - $strongarm->value = '840'; + $strongarm->value = '250'; $export['uc_store_country'] = $strongarm; $strongarm = new stdClass(); @@ -1387,21 +1387,21 @@ For your convenience, you are already logged in with your newly created account. $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'uc_store_phone'; - $strongarm->value = ''; + $strongarm->value = '+33 (0)1 40 41 51 15'; $export['uc_store_phone'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'uc_store_postal_code'; - $strongarm->value = ''; + $strongarm->value = '75012'; $export['uc_store_postal_code'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'uc_store_street1'; - $strongarm->value = ''; + $strongarm->value = '4 rue du faubourg Saint Martin'; $export['uc_store_street1'] = $strongarm; $strongarm = new stdClass();