diff --git a/app/assets/javascripts/admin/enterprises/directives/monthly_pricing_description.js.coffee b/app/assets/javascripts/admin/enterprises/directives/monthly_pricing_description.js.coffee deleted file mode 100644 index 6331fa2ca5..0000000000 --- a/app/assets/javascripts/admin/enterprises/directives/monthly_pricing_description.js.coffee +++ /dev/null @@ -1,8 +0,0 @@ -angular.module("admin.enterprises").directive "monthlyPricingDescription", (monthlyBillDescription) -> - restrict: 'E' - scope: - joiner: "@" - template: "" - link: (scope, element, attrs) -> - joiners = { comma: ", ", newline: "
" } - scope.billDescription = monthlyBillDescription.replace("{joiner}", joiners[scope.joiner]) diff --git a/app/assets/javascripts/templates/admin/panels/enterprise_package.html.haml b/app/assets/javascripts/templates/admin/panels/enterprise_package.html.haml index 3a1acb4fab..4ef49a3bc0 100644 --- a/app/assets/javascripts/templates/admin/panels/enterprise_package.html.haml +++ b/app/assets/javascripts/templates/admin/panels/enterprise_package.html.haml @@ -19,10 +19,6 @@ %h3 {{ 'js.admin.panels.enterprise_package.hub_shop' | t }} - %p - %strong - %monthly-pricing-description{ joiner: "comma" } - %p {{ 'js.admin.panels.enterprise_package.hub_shop_text1' | t }} @@ -66,10 +62,6 @@ %h3 {{ 'js.admin.panels.enterprise_package.producer_shop' | t }} - %p - %strong - %monthly-pricing-description{ joiner: "comma" } - %p {{ 'js.admin.panels.enterprise_package.producer_shop_text1' | t }} @@ -80,10 +72,6 @@ %h3 {{ 'js.admin.panels.enterprise_package.producer_hub' | t }} - %p - %strong - %monthly-pricing-description{ joiner: "comma" } - %p {{ 'js.admin.panels.enterprise_package.producer_hub_text1' | t }} @@ -121,8 +109,6 @@ {{ 'js.admin.panels.enterprise_package.hub_shop' | t }} %p {{ 'js.admin.panels.enterprise_package.sell_produce_others' | t }} - .bottom - %monthly-pricing-description{ joiner: "newline" } %div{ ng: { switch: { when: "true" } } } %a.button.selector.producer-profile{ ng: { click: "enterprise.owned && (enterprise.sells='none')", class: "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" } } @@ -139,8 +125,6 @@ {{ 'js.admin.panels.enterprise_package.producer_shop' | t }} %p {{ 'js.admin.panels.enterprise_package.sell_own_produce' | t }} - .bottom - %monthly-pricing-description{ joiner: "newline" } %a.button.selector.producer-hub{ ng: { click: "enterprise.owned && (enterprise.sells='any')", class: "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" } } .top @@ -148,8 +132,6 @@ {{ 'js.admin.panels.enterprise_package.producer_hub' | t }} %p {{ 'js.admin.panels.enterprise_package.sell_both' | t }} - .bottom - %monthly-pricing-description{ joiner: "newline" } %a.button.update.fullwidth{ ng: { show: "enterprise.owned", class: "{disabled: saved() && !saving, saving: saving}", click: "save()" } } %span{ ng: {hide: "saved() || saving" } } diff --git a/app/views/admin/enterprises/_change_type_form.html.haml b/app/views/admin/enterprises/_change_type_form.html.haml index 687ee3af3b..13e80cf8d0 100644 --- a/app/views/admin/enterprises/_change_type_form.html.haml +++ b/app/views/admin/enterprises/_change_type_form.html.haml @@ -22,9 +22,6 @@ .top %h3= t('.producer_shop') %p= t('.sell_your_produce') - .bottom - %monthly-pricing-description{ joiner: "newline" } - %p.description = t('.producer_shop_description_text') %br @@ -36,9 +33,6 @@ .top %h3= t('.producer_hub') %p= t('.producer_hub_text') - .bottom - %monthly-pricing-description{ joiner: "newline" } - %p.description = t('.producer_hub_description_text') @@ -59,8 +53,6 @@ .top %h3= t('.hub_shop') %p= t('.hub_shop_text') - .bottom - %monthly-pricing-description{ joiner: "newline" } %p.description = t('.hub_shop_description_text') .two.columns.omega