From 59d5ebe9d4d4ec9e83fb23c87fbd1471bac3e070 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Fri, 12 Jun 2015 12:32:17 +0800 Subject: [PATCH] Changes to copy --- .../admin/panels/enterprise_package.html.haml | 22 ++++++++++--------- .../panels/enterprise_producer.html.haml | 2 +- .../enterprises/_change_type_form.html.haml | 8 +++---- 3 files changed, 17 insertions(+), 15 deletions(-) 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 b061100099..0c59197f88 100644 --- a/app/assets/javascripts/templates/admin/panels/enterprise_package.html.haml +++ b/app/assets/javascripts/templates/admin/panels/enterprise_package.html.haml @@ -15,7 +15,7 @@ %h3 Hub Shop %p - %strong COST: %2 OF SALES, CAPPED AT $50 PER MONTH + %strong COST: 2% OF SALES, CAPPED AT $50 PER MONTH %p Your enterprise is the backbone of your local food system. You aggregate produce from other enterprises and can sell it through your shop on the Open Food Network. @@ -43,27 +43,29 @@ %p %strong COST: ALWAYS FREE + %p A profile makes you visible and contactable to others and is a way to share your story. + %p If you prefer to focus on producing food, and want to leave the work of selling it to someone else, you won't require a shop on the Open Food Network. - %p Add your products to Open Food Network, allowing customers to see your product range, and allowing you to act as a supplier to other shopfronts. + %p Add your products to Open Food Network, allowing hubs to stock your products in their stores. .info{ ng: { switch: { when: "own" } } } %h3 Producer Shop %p - %strong COST: %2 OF SALES, CAPPED AT $50 PER MONTH + %strong COST: 2% OF SALES, CAPPED AT $50 PER MONTH - %p You can offer your products for sale to customers through your very own Open Food Network shop. + %p Sell your products directly to customers through your very own Open Food Network shopfront. - %p You may sell produce that has been grown or produced on site, but you cannot sell produce from elsewhere through your OFN shop. + %p A Producer Shop is for your produce only, if you want to sell produce grown/produced off site, select 'Producer Hub'. .info{ ng: { switch: { when: "any" } } } %h3 Producer Hub %p - %strong COST: %2 OF SALES, CAPPED AT $50 PER MONTH + %strong COST: 2% OF SALES, CAPPED AT $50 PER MONTH - %p Your enterprise is the backbone of your local food system. You aggregate produce from other enterprises and can sell it through your shop on the Open Food Network. + %p Your enterprise is the backbone of your local food system. You can sell your own produce as well as produce aggregated from other enterprises through your shopfront on the Open Food Network. %p Producer Hubs can take many forms, whether they be a CSA, a veggie-box program, or a food co-op with a rooftop garden. @@ -92,7 +94,7 @@ %h3 Hub Shop %p Sell produce from others .bottom - \%2 OF SALES + \2% OF SALES %br CAPPED AT $50 PER MONTH @@ -107,7 +109,7 @@ %h3 Producer Shop %p Sell your own produce .bottom - \%2 OF SALES + \2% OF SALES %br CAPPED AT $50 PER MONTH %a.button.selector.producer-hub{ ng: { click: "enterprise.owned && (enterprise.sells='any')", class: "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" } } @@ -115,7 +117,7 @@ %h3 Producer Hub %p Sell produce from self and others .bottom - \%2 OF SALES + \2% OF SALES %br CAPPED AT $50 PER MONTH diff --git a/app/assets/javascripts/templates/admin/panels/enterprise_producer.html.haml b/app/assets/javascripts/templates/admin/panels/enterprise_producer.html.haml index 61b49c3e47..ea8554892f 100644 --- a/app/assets/javascripts/templates/admin/panels/enterprise_producer.html.haml +++ b/app/assets/javascripts/templates/admin/panels/enterprise_producer.html.haml @@ -18,7 +18,7 @@ %a.button.selector.producer{ ng: { click: 'enterprise.owned && changeToProducer()', class: "{selected: enterprise.is_primary_producer==true, disabled: !enterprise.owned}" } } .top %h3 PRODUCER - %p Primary producers of food + %p Producers of food .bottom eg. GROWERS, BAKERS, BREWERS, MAKERS %a.button.selector.non-producer{ ng: { click: 'enterprise.owned && changeToNonProducer()', class: "{selected: enterprise.is_primary_producer==false, disabled: !enterprise.owned}" } } diff --git a/app/views/admin/enterprises/_change_type_form.html.haml b/app/views/admin/enterprises/_change_type_form.html.haml index bb68ee6cff..740857e381 100644 --- a/app/views/admin/enterprises/_change_type_form.html.haml +++ b/app/views/admin/enterprises/_change_type_form.html.haml @@ -15,7 +15,7 @@ %p Connect through OFN .bottom ALWAYS FREE %p.description - Add your products to Open Food Network, allowing customers to see your product range, and allowing you to act as a supplier to other shopfronts. + Add your products to Open Food Network, allowing hubs to stock your products in their stores. %br %br Having a profile, and making connections within your local food system through the Open Food Network will always be free. @@ -30,10 +30,10 @@ %br CAPPED AT $50 PER MONTH %p.description - You can offer your products for sale to customers through your very own Open Food Network shop. + Sell your products directly to customers through your very own Open Food Network shopfront. %br %br - You may sell produce that has been grown or produced on site, but you cannot sell produce from elsewhere through your OFN shop. + A Producer Shop is for your produce only, if you want to sell produce grown/produced off site, select 'Producer Hub'. %br %br You will be billed for 2% of your actual transactions, capped at $50 a month (so if you don’t sell anything you don’t pay anything, but you never pay more than $50 a month). @@ -48,7 +48,7 @@ %br CAPPED AT $50 PER MONTH %p.description - Your enterprise is the backbone of your local food system. You aggregate produce from other enterprises and can sell it through your shop on the Open Food Network. + Your enterprise is the backbone of your local food system. You can sell your own produce as well as produce aggregated from other enterprises through your shopfront on the Open Food Network. %br %br You will be billed for 2% of your actual transactions, capped at $50 a month (so if you don’t sell anything you don’t pay anything, but you never pay more than $50 a month).