{{#if variant.option_values}}
diff --git a/app/views/spree/users/_fat.html.haml b/app/views/spree/users/_fat.html.haml
new file mode 100644
index 0000000000..c10cf8254a
--- /dev/null
+++ b/app/views/spree/users/_fat.html.haml
@@ -0,0 +1,29 @@
+.row{"ng-if" => "open()"}
+ .columns.small-12.fat
+ %table
+ %tr
+ %th.order1= t :transaction
+ %th.order2= t :transaction_date
+ %th.order3.show-for-large-up= t :payment_state
+ %th.order4.show-for-large-up= t :shipping_state
+ %th.order5.text-right= t :value
+ %th.order6.text-right.show-for-large-up= t :outstanding_balance
+ %th.order7.text-right= t :running_balance
+ %tbody.transaction-group{"ng-repeat" => "order in distributor.distributed_orders", "ng-class-odd"=>"'odd'", "ng-class-even"=>"'even'"}
+ %tr.order-row
+ %td.order1
+ %a{"bo-href" => "order.path", "bo-text" => "('order' | t )+ ' ' + order.number"}
+ %td.order2{"bo-text" => "order.completed_at"}
+ %td.order3.show-for-large-up{"bo-text" => "'spree.payment_states.' + order.payment_state | t | capitalize"}
+ %td.order4.show-for-large-up{"bo-text" => "'spree.shipment_states.' + order.shipment_state | t | capitalize"}
+ %td.order5.text-right{"ng-class" => "{'credit' : order.total < 0, 'debit' : order.total > 0, 'paid' : order.total == 0}","bo-text" => "order.total | localizeCurrency"}
+ %td.order6.text-right.show-for-large-up{"ng-class" => "{'credit' : order.outstanding_balance < 0, 'debit' : order.outstanding_balance > 0, 'paid' : order.outstanding_balance == 0}", "bo-text" => "order.outstanding_balance | localizeCurrency"}
+ %td.order7.text-right{"ng-class" => "{'credit' : order.running_balance < 0, 'debit' : order.running_balance > 0, 'paid' : order.running_balance == 0}", "bo-text" => "order.running_balance | localizeCurrency"}
+ %tr.payment-row{"ng-repeat" => "payment in order.payments"}
+ %td.order1= t :payment
+ %td.order2{"bo-text" => "payment.updated_at"}
+ %td.order3.show-for-large-up{"bo-text" => "payment.payment_method"}
+ %td.order4.show-for-large-up
+ %td.order5.text-right{"ng-class" => "{'credit' : payment.amount > 0, 'debit' : payment.amount < 0, 'paid' : payment.amount == 0}","bo-text" => "payment.amount | localizeCurrency"}
+ %td.order6.show-for-large-up
+ %td.order7
diff --git a/app/views/spree/users/_skinny.html.haml b/app/views/spree/users/_skinny.html.haml
new file mode 100644
index 0000000000..14c04f024a
--- /dev/null
+++ b/app/views/spree/users/_skinny.html.haml
@@ -0,0 +1,12 @@
+.row.active_table_row.skinny-head.margin-top{"ng-click" => "toggle($event)", "ng-class" => "{'closed' : !open()}"}
+ .columns.small-2
+ %span.margin-top
+ %img.account-logo{"logo-fallback" => true, "ng-src" => "{{distributor.logo}}"}
+ .columns.small-10.medium-5
+ %span.margin-top
+ %strong{"bo-text" => "distributor.name"}
+ .columns.small-8.small-offset-2.medium-3.text-right
+ %span.margin-top.distributor-balance{"bo-text" => "distributor.balance | formatBalance", "ng-class" => "{'credit' : distributor.balance < 0, 'debit' : distributor.balance > 0, 'paid' : distributor.balance == 0}" }
+ .columns.small-2.medium-2.text-right
+ %span.margin-top
+ %i{"ng-class" => "{'ofn-i_005-caret-down' : !open(), 'ofn-i_006-caret-up' : open()}"}
diff --git a/app/views/spree/users/show.html.haml b/app/views/spree/users/show.html.haml
index 878d271e42..83171daf0d 100644
--- a/app/views/spree/users/show.html.haml
+++ b/app/views/spree/users/show.html.haml
@@ -1,34 +1,24 @@
.darkswarm
+ = inject_orders_by_distributor
+
.row.pad-top
.small-12.columns.pad-top
- %h1= accurate_title
+ %h2= accurate_title
.account-summary{"data-hook" => "account_summary"}
- %dl#user-info
- %dt= t(:email)
- %dd
- = @user.email
- (#{link_to t(:edit), spree.edit_account_path})
- .account-my-orders{"data-hook" => "account_my_orders"}
- %h3= t(:my_orders)
- - if @orders.present?
- %table.order-summary
- %thead
- %tr
- %th.order-number= t(:order_number)
- %th.order-date= t(:order_date)
- %th.order-status= t(:status)
- %th.order-payment-state= t(:payment_state)
- %th.order-shipment-state= t(:shipment_state)
- %th.order-total= t(:total)
- %tbody
- - @orders.each do |order|
- %tr{class: cycle('even', 'odd')}
- %td.order-number= link_to order.number, order_url(order)
- %td.order-date= l order.completed_at.to_date
- %td.order-status= t(order.state).titleize
- %td.order-payment-state= t("payment_states.#{order.payment_state}") if order.payment_state
- %td.order-shipment-state= t("shipment_states.#{order.shipment_state}") if order.shipment_state
- %td.order-total= money order.total
- - else
- %p= t(:you_have_no_orders_yet)
- %br/
+ = @user.email
+ (#{link_to t(:edit), spree.edit_account_path})
+ %h3= t(:my_orders)
+ .orders{"ng-controller" => "OrdersCtrl", "ng-cloak" => true}
+ .row{bindonce: true}
+ .small-12.columns
+ .active_table
+ %distributor.active_table_node.row.animate-repeat{"ng-if" => "Orders.orders_by_distributor.length > 0", "ng-repeat" => "(key, distributor) in Orders.orders_by_distributor",
+ "ng-controller" => "DistributorNodeCtrl",
+ "ng-class" => "{'closed' : !open(), 'open' : open(), 'inactive' : !distributor.active}",
+ id: "{{distributor.hash}}"}
+ .small-12.columns
+ = render partial: "spree/users/skinny"
+ = render partial: "spree/users/fat"
+ .message{"ng-if" => "Orders.orders_by_distributor.length == 0", "bo-text" => "'you_have_no_orders_yet' | t"}
+
+ = render partial: "shared/footer"
diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb
new file mode 100644
index 0000000000..08d8aa67fc
--- /dev/null
+++ b/config/initializers/acts_as_taggable_on.rb
@@ -0,0 +1 @@
+ActsAsTaggableOn.force_lowercase = true
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index cf8e7e78dc..58441e9934 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -10,23 +10,140 @@ en-GB:
password:
confirmation: you have successfully registered
too_short: pick a longer name
+ # Overridden here due to a bug in spree i18n (Issue #870)
+ attributes:
+ spree/order:
+ payment_state: Payment State
+ shipment_state: Shipment State
+
devise:
failure:
invalid: |
Invalid email or password.
Were you a guest last time? Perhaps you need to create an account or reset your password.
+ enterprise_confirmations:
+ enterprise:
+ confirmed: Thankyou, your email address has been confirmed.
+ not_confirmed: Your email address could not be confirmed. Perhaps you have already completed this step?
+ confirmation_sent: "Confirmation email sent!"
+ confirmation_not_sent: "Could not send a confirmation email."
home: "OFN"
title: Open Food Network
welcome_to: 'Welcome to '
+ site_meta_description: "We begin from the ground up. With farmers and growers ready to tell their stories proudly and truly. With distributors ready to connect people with products fairly and honestly. With buyers who believe that better weekly shopping decisions can…"
search_by_name: Search by name...
producers: UK Producers
producers_join: UK producers are now welcome to join Open Food Network UK.
- charges_sales_tax: Charges sales tax?
- print: "Print"
+ charges_sales_tax: Charges VAT?
+ print_invoice: "Print Invoice"
+ send_invoice: "Send Invoice"
+ resend_confirmation: "Resend Confirmation"
+ view_order: "View Order"
+ edit_order: "Edit Order"
+ ship_order: "Ship Order"
+ cancel_order: "Cancel Order"
+ confirm_send_invoice: "An invoice for this order will be sent to the customer. Are you sure you want to continue?"
+ confirm_resend_order_confirmation: "Are you sure you want to resend the order confirmation email?"
+ invoice: "Invoice"
+ percentage_of_sales: "%{percentage} of sales"
+ percentage_of_turnover: "Percentage of turnover"
+ monthly_cap_excl_tax: "monthly cap (excl. VAT)"
+ capped_at_cap: "capped at %{cap}"
+ per_month: "per month"
+ free: "free"
+ plus_tax: "plus GST"
+ total_monthly_bill_incl_tax: "Total Monthly Bill (Incl. Tax)"
+ say_no: "No"
+ say_yes: "Yes"
- logo: "Logo (640x130)"
- logo_mobile: "Mobile logo (75x26)"
- logo_mobile_svg: "Mobile logo (SVG)"
+ sort_order_cycles_on_shopfront_by: "Sort Order Cycles On Shopfront By"
+
+
+ admin:
+ # General form elements
+ quick_search: Quick Search
+ clear_all: Clear All
+ producer: Producer
+ shop: Shop
+ product: Product
+ variant: Variant
+
+ columns: Columns
+ actions: Actions
+ viewing: "Viewing: %{current_view_name}"
+
+ whats_this: What's this?
+
+ customers:
+ index:
+ add_customer: "Add customer"
+ customer_placeholder: "customer@example.org"
+ inventory:
+ title: Inventory
+ description: Use this page to manage inventories for your enterprises. Any product details set here will override those set on the 'Products' page
+ sku: SKU
+ price: Price
+ on_hand: On Hand
+ on_demand: On Demand?
+ enable_reset: Enable Stock Level Reset?
+ inherit: Inherit?
+ add: Add
+ hide: Hide
+ select_a_shop: Select A Shop
+ review_now: Review Now
+ new_products_alert_message: There are %{new_product_count} new products available to add to your inventory.
+ currently_empty: Your inventory is currently empty
+ no_matching_products: No matching products found in your inventory
+ no_hidden_products: No products have been hidden from this inventory
+ no_matching_hidden_products: No hidden products match your search criteria
+ no_new_products: No new products are available to add to this inventory
+ no_matching_new_products: No new products match your search criteria
+ inventory_powertip: This is your inventory of products. To add products to your inventory, select 'New Products' from the Viewing dropdown.
+ hidden_powertip: These products have been hidden from your inventory and will not be available to add to your shop. You can click 'Add' to add a product to you inventory.
+ new_powertip: These products are available to be added to your inventory. Click 'Add' to add a product to your inventory, or 'Hide' to hide it from view. You can always change your mind later!
+
+
+ order_cycle:
+ choose_products_from: "Choose Products From:"
+
+ enterprise:
+ select_outgoing_oc_products_from: Select outgoing OC products from
+
+ enterprises:
+ form:
+ primary_details:
+ shopfront_requires_login: "Shopfront requires login?"
+ shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront."
+ shopfront_requires_login_false: "Public"
+ shopfront_requires_login_true: "Require customers to login"
+
+ home:
+ hubs:
+ show_closed_shops: "Show closed shops"
+ hide_closed_shops: "Hide closed shops"
+ show_on_map: "Show all on the map"
+ shared:
+ register_call:
+ selling_on_ofn: "Interested in getting on the Open Food Network?"
+ register: "Register here"
+ shop:
+ messages:
+ login: "login"
+ register: "register"
+ contact: "contact"
+ require_customer_login: "This shop is for customers only."
+ require_login_html: "Please %{login} if you have an account already. Otherwise, %{register} to become a customer."
+ require_customer_html: "Please %{contact} %{enterprise} to become a customer."
+
+ # Printable Invoice Columns
+ invoice_column_item: "Item"
+ invoice_column_qty: "Qty"
+ invoice_column_tax: "VAT"
+ invoice_column_price: "Price"
+
+ logo: "Logo (640x130)" #FIXME
+ logo_mobile: "Mobile logo (75x26)" #FIXME
+ logo_mobile_svg: "Mobile logo (SVG)" #FIXME
home_hero: "Hero image"
home_show_stats: "Show statistics"
footer_logo: "Logo (220x76)"
@@ -40,11 +157,10 @@ en-GB:
footer_links_md: "Links"
footer_about_url: "About URL"
footer_tos_url: "Terms of Service URL"
- invoice: "Invoice"
name: Name
- first_name: First name
- last_name: Last name
+ first_name: First Name
+ last_name: Last Name
email: Email
phone: Phone
next: Next
@@ -84,9 +200,9 @@ en-GB:
cart_empty: "Cart empty"
cart_edit: "Edit your cart"
- card_number: Card number
- card_securitycode: "Security code"
- card_expiry_date: Expiry date
+ card_number: Card Number
+ card_securitycode: "Security Code"
+ card_expiry_date: Expiry Date
ofn_cart_headline: "Current cart for:"
ofn_cart_distributor: "Distributor:"
@@ -181,7 +297,7 @@ en-GB:
checkout_cart_total: Cart total
checkout_shipping_price: Shipping
checkout_total_price: Total
- checkout_back_to_cart: "Back to cart"
+ checkout_back_to_cart: "Back to Cart"
order_paid: PAID
order_not_paid: NOT PAID
@@ -191,12 +307,32 @@ en-GB:
order_delivery_on: Delivery on
order_delivery_address: Delivery address
order_special_instructions: "Your notes:"
- order_pickup_instructions: Collection instructions
+ order_pickup_time: Ready for collection
+ order_pickup_instructions: Collection Instructions
order_produce: Produce
order_total_price: Total
order_includes_tax: (includes tax)
order_payment_paypal_successful: Your payment via PayPal has been processed successfully.
- order_hub_info: Hub info
+ order_hub_info: Hub Info
+
+ bom_tip: "Use this page to alter product quantities across multiple orders. Products may also be removed from orders entirely, if required."
+ bom_shared: "Shared Resource?"
+ bom_page_title: "Bulk Order Management"
+ bom_no: "Order no."
+ bom_date: "Order date"
+ bom_cycle: "Order cycle"
+ bom_max: "Max"
+ bom_hub: "Hub"
+ bom_variant: "Product: Unit"
+ bom_final_weigth_volume: "Weight/Volume"
+ bom_quantity: "Quantity"
+ bom_actions_delete: "Delete Selected"
+ bom_loading: "Loading orders"
+ bom_no_results: "No orders found."
+ bom_order_error: "Some errors must be resolved before you can update orders.\nAny fields with red borders contain errors."
+
+ unsaved_changes_warning: "Unsaved changes exist and will be lost if you continue."
+ unsaved_changes_error: "Fields with red borders contain errors."
products: "Products"
products_in: "in %{oc}"
@@ -301,6 +437,11 @@ See the %{link} to find out more about %{sitename}'s features and to start using
products_cart_empty: "Cart empty"
products_edit_cart: "Edit your cart"
products_from: from
+ products_change: "No changes to save."
+ products_update_error: "Saving failed with the following error(s):"
+ products_update_error_msg: "Saving failed."
+ products_update_error_data: "Save failed due to invalid data:"
+ products_changes_saved: "Changes saved."
search_no_results_html: "Sorry, no results found for %{query}. Try another search?"
@@ -311,9 +452,11 @@ See the %{link} to find out more about %{sitename}'s features and to start using
groups_title: Groups
groups_headline: Groups / regions
+ groups_text: "Every producer is unique. Every business has something different to offer. Our groups are collectives of producers, hubs and distributors who share something in common like location, farmers market or philosophy. This makes your shopping experience easier. So explore our groups and have the curating done for you."
groups_search: "Search name or keyword"
groups_no_groups: "No groups found"
groups_about: "About Us"
+
groups_producers: "Our producers"
groups_hubs: "Our hubs"
groups_contact_web: Contact
@@ -378,9 +521,9 @@ See the %{link} to find out more about %{sitename}'s features and to start using
ocs_close_time: "ORDERS CLOSE"
ocs_when_headline: When do you want your order?
ocs_when_text: No products are displayed until you select a date.
- ocs_when_closing: "Closing on"
+ ocs_when_closing: "Closing On"
ocs_when_choose: "Choose Order Cycle"
- ocs_list: "List view"
+ ocs_list: "List View"
producers_about: About us
producers_buy: Shop for
@@ -401,13 +544,26 @@ See the %{link} to find out more about %{sitename}'s features and to start using
producers_signup_cta_headline: Join now!
producers_signup_cta_action: Join now
producers_signup_detail: Here's the detail.
+ producer: Producer
products_item: Item
products_description: Description
products_variant: Variant
products_quantity: Quantity
products_availabel: Available?
- products_price: Price
+ products_producer: "Producer"
+ products_price: "Price"
+ products_sku: "SKU"
+ products_name: "name"
+ products_unit: "unit"
+ products_on_hand: "on hand"
+ products_on_demand: "On demand?"
+ products_category: "Category"
+ products_tax_category: "tax category"
+ products_available_on: "Available On"
+ products_inherit: "Inherit?"
+ products_inherits_properties: "Inherits Properties?"
+ products_stock_level_reset: "Enable Stock Level Reset?"
register_title: Register
@@ -425,7 +581,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
shops_signup_detail: Here's the detail.
orders_fees: Fees...
- orders_edit_title: Shopping cart
+ orders_edit_title: Shopping Cart
orders_edit_headline: Your shopping cart
orders_edit_time: Order ready for
orders_edit_continue: Continue shopping
@@ -503,18 +659,17 @@ See the %{link} to find out more about %{sitename}'s features and to start using
confirm_password: "Confirm password"
action_signup: "Sign up now"
welcome_to_ofn: "Welcome to the Open Food Network!"
- signup_or_login: "Start By signing up (or logging in)"
+ signup_or_login: "Start By Signing Up (or logging in)"
have_an_account: "Already have an account?"
action_login: "Log in now."
- forgot_password: "Forgot password?"
+ forgot_password: "Forgot Password?"
password_reset_sent: "An email with instructions on resetting your password has been sent!"
reset_password: "Reset password"
registration_greeting: "Greetings!"
who_is_managing_enterprise: "Who is responsible for managing %{enterprise}?"
- enterprise_contact: "Primary contact"
+ enterprise_contact: "Primary Contact"
enterprise_contact_required: "You need to enter a primary contact."
- enterprise_email: "Email address"
- enterprise_email_required: "You need to enter valid email address."
+ enterprise_email_address: "Email address"
enterprise_phone: "Phone number"
back: "Back"
continue: "Continue"
@@ -522,20 +677,20 @@ See the %{link} to find out more about %{sitename}'s features and to start using
limit_reached_message: "You have reached the limit!"
limit_reached_text: "You have reached the limit for the number of enterprises you are allowed to own on the"
limit_reached_action: "Return to the homepage"
- select_promo_image: "Step 3. Select promo image"
+ select_promo_image: "Step 3. Select Promo Image"
promo_image_tip: "Tip: Shown as a banner, preferred size is 1200×260px"
promo_image_label: "Choose a promo image"
action_or: "OR"
promo_image_drag: "Drag and drop your promo here"
- review_promo_image: "Step 4. Review your promo banner"
+ review_promo_image: "Step 4. Review Your Promo Banner"
review_promo_image_tip: "Tip: for best results, your promo image should fill the available space"
promo_image_placeholder: "Your logo will appear here for review once uploaded"
uploading: "Uploading..."
- select_logo: "Step 1. Select logo image"
+ select_logo: "Step 1. Select Logo Image"
logo_tip: "Tip: Square images will work best, preferably at least 300×300px"
logo_label: "Choose a logo image"
logo_drag: "Drag and drop your logo here"
- review_logo: "Step 2. Review your logo"
+ review_logo: "Step 2. Review Your Logo"
review_logo_tip: "Tip: for best results, your logo should fill the available space"
logo_placeholder: "Your logo will appear here for review once uploaded"
enterprise_about_headline: "Nice one!"
@@ -592,14 +747,14 @@ Please follow the instructions there to make your enterprise visible on the Open
registration_type_error: "Please choose one. Are you are producer?"
registration_type_producer_help: "Producers make yummy things to eat and/or drink. You're a producer if you grow it, raise it, brew it, bake it, ferment it, milk it or mould it."
registration_type_no_producer_help: "If you’re not a producer, you’re probably someone who sells and distributes food. You might be a hub, coop, buying group, retailer, wholesaler or other."
- create_profile: "Create profile"
+ create_profile: "Create Profile"
registration_images_headline: "Thanks!"
registration_images_description: "Let's upload some pretty pictures so your profile looks great! :)"
- registration_detail_headline: "Let's get started"
+ registration_detail_headline: "Let's Get Started"
registration_detail_enterprise: "Woot! First we need to know a little bit about your enterprise:"
registration_detail_producer: "Woot! First we need to know a little bit about your farm:"
- registration_detail_name_enterprise: "Enterprise name:"
- registration_detail_name_producer: "Farm name:"
+ registration_detail_name_enterprise: "Enterprise Name:"
+ registration_detail_name_producer: "Farm Name:"
registration_detail_name_placeholder: "e.g. Charlie's Awesome Farm"
registration_detail_name_error: "Please choose a unique name for your enterprise"
registration_detail_address1: "Address line 1:"
@@ -635,6 +790,253 @@ Please follow the instructions there to make your enterprise visible on the Open
price_graph: "Price graph"
included_tax: "Included tax"
remove_tax: "Remove tax"
+ balance: "Balance"
+ transaction: "Transaction"
+ transaction_date: "Date" #Transaction is only in key to avoid conflict with :date
+ payment_state: "Payment status"
+ shipping_state: "Shipping status"
+ value: "Value"
+ balance_due: "Balance due"
+ credit: "Credit"
+ Paid: "Paid"
+ Ready: "Ready"
+ you_have_no_orders_yet: "You have no orders yet"
+ running_balance: "Running balance"
+ outstanding_balance: "Outstanding balance"
+ admin_entreprise_relationships: "Enterprise Relationships"
+ admin_entreprise_relationships_everything: "Everything"
+ admin_entreprise_relationships_permits: "permits"
+ admin_entreprise_relationships_seach_placeholder: "Search"
+ admin_entreprise_relationships_button_create: "Create"
+ admin_entreprise_groups: "Enterprise Groups"
+ admin_entreprise_groups_name: "Name"
+ admin_entreprise_groups_owner: "Owner"
+ admin_entreprise_groups_on_front_page: "On front page ?"
+ admin_entreprise_groups_entreprise: "Enterprises"
+ admin_entreprise_groups_primary_details: "Primary Details"
+ admin_entreprise_groups_data_powertip: "The primary user responsible for this group."
+ admin_entreprise_groups_data_powertip_logo: "This is the logo for the group"
+ admin_entreprise_groups_data_powertip_promo_image: "This image is displayed at the top of the Group profile"
+ admin_entreprise_groups_about: "About"
+ admin_entreprise_groups_images: "Images"
+ admin_entreprise_groups_contact: "Contact"
+ admin_entreprise_groups_contact_phone_placeholder: "eg. 98 7654 3210"
+ admin_entreprise_groups_contact_address1_placeholder: "eg. 123 High Street"
+ admin_entreprise_groups_contact_city: "Suburb"
+ admin_entreprise_groups_contact_city_placeholder: "eg. Northcote"
+ admin_entreprise_groups_contact_zipcode: "Postcode"
+ admin_entreprise_groups_contact_zipcode_placeholder: "eg. 3070"
+ admin_entreprise_groups_contact_state_id: "State"
+ admin_entreprise_groups_contact_country_id: "Country"
+ admin_entreprise_groups_web: "Web Resources"
+ admin_entreprise_groups_web_twitter: "eg. @the_prof"
+ admin_entreprise_groups_web_website_placeholder: "eg. www.truffles.com"
+ admin_order_cycles: "Admin Order Cycles"
+ open: "Open"
+ close: "Close"
+ supplier: "Supplier"
+ coordinator: "Coordinator"
+ distributor: "Distributor"
+ product: "Products"
+ enterprise_fees: "Enterprise Fees"
+ fee_type: "Fee Type"
+ tax_category: "Tax Category"
+ calculator: "Calculator"
+ calculator_values: "Calculator values"
+ new_order_cycles: "New Order Cycles"
+ select_a_coordinator_for_your_order_cycle: "select a coordinator for your order cycle"
+ edit_order_cycle: "Edit Order Cycle"
+ roles: "Roles"
+ update: "Update"
+ add_producer_property: "Add producer property"
+ admin_settings: "Settings"
+ update_invoice: "Update Invoices"
+ finalise_invoice: "Finalise Invoices"
+ finalise_user_invoices: "Finalise User Invoices"
+ finalise_user_invoice_explained: "Use this button to finalize all invoices in the system for the previous calendar month. This task can be set up to run automatically once a month."
+ manually_run_task: "Manually Run Task "
+ update_user_invoices: "Update User Invoices"
+ update_user_invoice_explained: "Use this button to immediately update invoices for the month to date for each enterprise user in the system. This task can be set up to run automatically every night."
+ auto_finalise_invoices: "Auto-finalise invoices monthly on the 2nd at 1:30am"
+ auto_update_invoices: "Auto-update invoices nightly at 1:00am"
+ in_progress: "In Progress"
+ started_at: "Started at"
+ queued: "Queued"
+ scheduled_for: "Scheduled for"
+ customers: "Customers"
+ please_select_hub: "Please select a Hub"
+ loading_customers: "Loading Customers"
+ no_customers_found: "No customers found"
+ go: "Go"
+ hub: "Hub"
+ accounts_administration_distributor: "accounts administration distributor"
+ accounts_and_billing: "Accounts & Billing"
+ producer: "Producer"
+ product: "Product"
+ price: "Price"
+ on_hand: "On hand"
+ save_changes: "Save Changes"
+ spree_admin_overview_enterprises_header: "My Enterprises"
+ spree_admin_overview_enterprises_footer: "MANAGE MY ENTERPRISES"
+ spree_admin_enterprises_hubs_name: "Name"
+ spree_admin_enterprises_create_new: "CREATE NEW"
+ spree_admin_enterprises_shipping_methods: "Shipping Methods"
+ spree_admin_enterprises_fees: "Enterprise Fees"
+ spree_admin_enterprises_none_create_a_new_enterprise: "CREATE A NEW ENTERPRISE"
+ spree_admin_enterprises_none_text: "You don't have any enterprises yet"
+ spree_admin_enterprises_producers_name: "Name"
+ spree_admin_enterprises_producers_total_products: "Total Products"
+ spree_admin_enterprises_producers_active_products: "Active Products"
+ spree_admin_enterprises_producers_order_cycles: "Products in OCs"
+ spree_admin_enterprises_producers_order_cycles_title: ""
+ spree_admin_enterprises_tabs_hubs: "HUBS"
+ spree_admin_enterprises_tabs_producers: "PRODUCERS"
+ spree_admin_enterprises_producers_manage_order_cycles: "MANAGE ORDER CYCLES"
+ spree_admin_enterprises_producers_manage_products: "MANAGE PRODUCTS"
+ spree_admin_enterprises_producers_orders_cycle_text: "You don't have any active order cycles."
+ spree_admin_enterprises_any_active_products_text: "You don't have any active products."
+ spree_admin_enterprises_create_new_product: "CREATE A NEW PRODUCT"
+ spree_admin_order_cycles: "Order Cycles"
+ spree_admin_order_cycles_tip: "Order cycles determine when and where your products are available to customers."
+ dashbord: "Dashboard"
+ spree_admin_single_enterprise_alert_mail_confirmation: "Please confirm the email address for"
+ spree_admin_single_enterprise_alert_mail_sent: "We've sent an email to"
+ spree_admin_overview_action_required: "Action Required"
+ spree_admin_overview_check_your_inbox: "Please check you inbox for furher instructions. Thanks!"
+ change_package: "Change Package"
+ spree_admin_single_enterprise_hint: "Hint: To allow people to find you, turn on your visibility under"
+ your_profil_live: "Your profile live"
+ on_ofn_map: "on the Open Food Network map"
+ see: "See"
+ live: "live"
+ manage: "Manage"
+ resend: "Resend"
+ add_and_manage_products: "Add & manage products"
+ add_and_manage_order_cycles: "Add & manage order cycles"
+ manage_order_cycles: "Manage order cycles"
+ manage_products: "Manage products"
+ edit_profile_details: "Edit profile details"
+ edit_profile_details_etc: "Change your profile description, images, etc."
+ start_date: "Start Date"
+ end_date: "End Date"
+ order_cycle: "Order Cycle"
+ group_buy_unit_size: "Group Buy Unit Size"
+ total_qtt_ordered: "Total Quantity Ordered"
+ max_qtt_ordered: "Max Quantity Ordered"
+ current_fulfilled_units: "Current Fulfilled Units"
+ max_fulfilled_units: "Max Fulfilled Units"
+ bulk_management_warning: "WARNING: Some variants do not have a unit value"
+ ask: "Ask?"
+ no_orders_found: "No orders found."
+ order_no: "Order No."
+ weight_volume: "Weight/Volume"
+ remove_tax: "Remove tax"
+ tax_settings: "Tax Settings"
+ products_require_tax_category: "products require tax category"
+ admin_shared_address_1: "Address"
+ admin_shared_address_2: "Address (cont.)"
+ admin_share_city: "City"
+ admin_share_zipcode: "Postcode"
+ admin_share_country: "Country"
+ admin_share_state: "State"
+ hub_sidebar_hubs: "Hubs"
+ hub_sidebar_none_available: "None Available"
+ hub_sidebar_manage: "Manage"
+ hub_sidebar_at_least: "At least one hub must be selected"
+ hub_sidebar_blue: "blue"
+ hub_sidebar_red: "red"
+ shop_trial_in_progress: "Your shopfront trial expires in %{days}."
+ shop_trial_expired: "Good news! We have decided to extend shopfront trials until further notice (probably around March 2015)." #FIXME
+ report_customers_distributor: "Distributor"
+ report_customers_supplier: "Supplier"
+ report_customers_cycle: "Order Cycle"
+ report_customers_type: "Report Type"
+ report_customers_csv: "Download as csv"
+ report_producers: "Producers: "
+ report_type: "Report Type: "
+ report_hubs: "Hubs: "
+ report_payment: "Payment Methods: "
+ report_distributor: "Distributor: "
+ report_payment_by: 'Payments By Type'
+ report_itemised_payment: 'Itemised Payment Totals'
+ report_payment_totals: 'Payment Totals'
+ report_all: 'all'
+ report_order_cycle: "Order Cycle: "
+ report_entreprises: "Enterprises: "
+ report_users: "Users: "
+ initial_invoice_number: "Initial invoice number:"
+ invoice_date: "Invoice date:"
+ due_date: "Due date:"
+ account_code: "Account code:"
+ equals: "Equals"
+ contains: "contains"
+ discount: "Discount"
+ filter_products: "Filter Products"
+ delete_product_variant: "The last variant cannot be deleted!"
+ progress: "progress"
+ saving: "Saving.."
+ success: "success"
+ failure: "failure"
+ unsaved_changes_confirmation: "Unsaved changes will be lost. Continue anyway?"
+ one_product_unsaved: "Changes to one product remain unsaved."
+ products_unsaved: "Changes to %{n} products remain unsaved."
+ add_manager: "Add a manager"
+ is_already_manager: "is already a manager!"
+ no_change_to_save: " No change to save"
+ add_manager: "Add a manager"
+ users: "Users"
+ about: "About"
+ images: "Images"
+ contact: "Contact"
+ web: "Web"
+ primary_details: "Primary Details"
+ adrdress: "Address"
+ contact: "Contact"
+ social: "Social"
+ business_details: "Business Details"
+ properties: "Properties"
+ shipping_methods: "Shipping Methods"
+ payment_methods: "Payment Methods"
+ enterprise_fees: "Enterprise Fees"
+ inventory_settings: "Inventory Settings"
+ tag_rules: "Tag Rules"
+ shop_preferences: "Shop Preferences"
+ validation_msg_relationship_already_established: "^That relationship is already established."
+ validation_msg_at_least_one_hub: "^At least one hub must be selected"
+ validation_msg_product_category_cant_be_blank: "^Product Category cant be blank"
+ validation_msg_tax_category_cant_be_blank: "^Tax Category can't be blank"
+ validation_msg_is_associated_with_an_exising_customer: "is associated with an existing customer"
+
+ spree:
+ shipment_states:
+ backorder: backorder
+ partial: partial
+ pending: pending
+ ready: ready
+ shipped: shipped
+ payment_states:
+ balance_due: balance due
+ completed: completed
+ checkout: checkout
+ credit_owed: credit owed
+ failed: failed
+ paid: paid
+ pending: pending
+ processing: processing
+ void: void
+ order_state:
+ address: address
+ adjustments: adjustments
+ awaiting_return: awaiting return
+ canceled: canceled
+ cart: cart
+ complete: complete
+ confirm: confirm
+ delivery: delivery
+ payment: payment
+ resumed: resumed
+ returned: returned
+ skrill: skrill
shop_trial_length: "Shop Trial Length (Days)"
shop_trial_length: "Shop Trial Length (Days)"
shop_trial_expires_in: "Your shopfront trial expires in"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 47deeda40b..34c4f4d4e9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -15,6 +15,12 @@
# See http://community.openfoodnetwork.org/t/localisation-ofn-in-your-language/397
en:
+ activerecord:
+ # Overridden here due to a bug in spree i18n (Issue #870)
+ attributes:
+ spree/order:
+ payment_state: Payment State
+ shipment_state: Shipment State
devise:
failure:
invalid: |
@@ -31,8 +37,8 @@ en:
welcome_to: 'Welcome to '
site_meta_description: "We begin from the ground up. With farmers and growers ready to tell their stories proudly and truly. With distributors ready to connect people with products fairly and honestly. With buyers who believe that better weekly shopping decisions can…"
search_by_name: Search by name or suburb...
- producers: Aussie Producers
- producers_join: Australian producers are now welcome to join the Open Food Network.
+ producers: 'Australian Producers'
+ producers_join: Australian producers are now welcome to join the Open Food Network. #FIXME
charges_sales_tax: Charges GST?
print_invoice: "Print Invoice"
send_invoice: "Send Invoice"
@@ -74,6 +80,10 @@ en:
whats_this: What's this?
+ customers:
+ index:
+ add_customer: "Add customer"
+ customer_placeholder: "customer@example.org"
inventory:
title: Inventory
description: Use this page to manage inventories for your enterprises. Any product details set here will override those set on the 'Products' page
@@ -105,18 +115,44 @@ en:
enterprise:
select_outgoing_oc_products_from: Select outgoing OC products from
+ enterprises:
+ form:
+ primary_details:
+ shopfront_requires_login: "Shopfront requires login?"
+ shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront."
+ shopfront_requires_login_false: "Public"
+ shopfront_requires_login_true: "Require customers to login"
+
+ home:
+ hubs:
+ show_closed_shops: "Show closed shops"
+ hide_closed_shops: "Hide closed shops"
+ show_on_map: "Show all on the map"
+ shared:
+ register_call:
+ selling_on_ofn: "Interested in getting on the Open Food Network?"
+ register: "Register here"
+ shop:
+ messages:
+ login: "login"
+ register: "register"
+ contact: "contact"
+ require_customer_login: "This shop is for customers only."
+ require_login_html: "Please %{login} if you have an account already. Otherwise, %{register} to become a customer."
+ require_customer_html: "Please %{contact} %{enterprise} to become a customer."
+
# Printable Invoice Columns
invoice_column_item: "Item"
invoice_column_qty: "Qty"
invoice_column_tax: "GST"
invoice_column_price: "Price"
- logo: "Logo (640x130)"
- logo_mobile: "Mobile logo (75x26)"
- logo_mobile_svg: "Mobile logo (SVG)"
+ logo: "Logo (640x130)" #FIXME
+ logo_mobile: "Mobile logo (75x26)" #FIXME
+ logo_mobile_svg: "Mobile logo (SVG)" #FIXME
home_hero: "Hero image"
home_show_stats: "Show statistics"
- footer_logo: "Logo (220x76)"
+ footer_logo: "Logo (220x76)" #FIXME
footer_facebook_url: "Facebook URL"
footer_twitter_url: "Twitter URL"
footer_instagram_url: "Instagram URL"
@@ -145,8 +181,6 @@ en:
on_demand: On demand
none: None
- alert_selling_on_ofn: "Interested in selling food on the Open Food Network?"
- alert_start_here: "Start here"
label_shops: "Shops"
label_map: "Map"
label_producers: "Producers"
@@ -159,7 +193,7 @@ en:
label_administration: "Administration"
label_admin: "Admin"
label_account: "Account"
- label_more: "More"
+ label_more: "Show more"
label_less: "Show less"
label_notices: "Notices"
@@ -286,6 +320,25 @@ en:
order_payment_paypal_successful: Your payment via PayPal has been processed successfully.
order_hub_info: Hub Info
+ bom_tip: "Use this page to alter product quantities across multiple orders. Products may also be removed from orders entirely, if required."
+ bom_shared: "Shared Resource?"
+ bom_page_title: "Bulk Order Management"
+ bom_no: "Order no."
+ bom_date: "Order date"
+ bom_cycle: "Order cycle"
+ bom_max: "Max"
+ bom_hub: "Hub"
+ bom_variant: "Product: Unit"
+ bom_final_weigth_volume: "Weight/Volume"
+ bom_quantity: "Quantity"
+ bom_actions_delete: "Delete Selected"
+ bom_loading: "Loading orders"
+ bom_no_results: "No orders found."
+ bom_order_error: "Some errors must be resolved before you can update orders.\nAny fields with red borders contain errors."
+
+ unsaved_changes_warning: "Unsaved changes exist and will be lost if you continue."
+ unsaved_changes_error: "Fields with red borders contain errors."
+
products: "Products"
products_in: "in %{oc}"
products_at: "at %{distributor}"
@@ -389,6 +442,11 @@ See the %{link} to find out more about %{sitename}'s features and to start using
products_cart_empty: "Cart empty"
products_edit_cart: "Edit your cart"
products_from: from
+ products_change: "No changes to save."
+ products_update_error: "Saving failed with the following error(s):"
+ products_update_error_msg: "Saving failed."
+ products_update_error_data: "Save failed due to invalid data:"
+ products_changes_saved: "Changes saved."
search_no_results_html: "Sorry, no results found for %{query}. Try another search?"
@@ -403,6 +461,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
groups_search: "Search name or keyword"
groups_no_groups: "No groups found"
groups_about: "About Us"
+
groups_producers: "Our producers"
groups_hubs: "Our hubs"
groups_contact_web: Contact
@@ -490,13 +549,26 @@ See the %{link} to find out more about %{sitename}'s features and to start using
producers_signup_cta_headline: Join now!
producers_signup_cta_action: Join now
producers_signup_detail: Here's the detail.
+ producer: Producer
products_item: Item
products_description: Description
products_variant: Variant
products_quantity: Quantity
products_availabel: Available?
- products_price: Price
+ products_producer: "Producer"
+ products_price: "Price"
+ products_sku: "SKU"
+ products_name: "name"
+ products_unit: "unit"
+ products_on_hand: "on hand"
+ products_on_demand: "On demand?"
+ products_category: "Category"
+ products_tax_category: "tax category"
+ products_available_on: "Available On"
+ products_inherit: "Inherit?"
+ products_inherits_properties: "Inherits Properties?"
+ products_stock_level_reset: "Enable Stock Level Reset?"
register_title: Register
@@ -542,7 +614,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
products_oc_is: "Your order cycle for this order is %{name}."
products_oc_error: "Please complete your order from %{link} before shopping in a different order cycle."
products_oc_current: "your current order cycle"
- products_quantity: Quantity
products_max_quantity: Max quantity
products_distributor: Distributor
products_distributor_info: When you select a distributor for your order, their address and pickup times will be displayed here.
@@ -723,6 +794,253 @@ Please follow the instructions there to make your enterprise visible on the Open
price_graph: "Price graph"
included_tax: "Included tax"
remove_tax: "Remove tax"
+ balance: "Balance"
+ transaction: "Transaction"
+ transaction_date: "Date" #Transaction is only in key to avoid conflict with :date
+ payment_state: "Payment status"
+ shipping_state: "Shipping status"
+ value: "Value"
+ balance_due: "Balance due"
+ credit: "Credit"
+ Paid: "Paid"
+ Ready: "Ready"
+ you_have_no_orders_yet: "You have no orders yet"
+ running_balance: "Running balance"
+ outstanding_balance: "Outstanding balance"
+ admin_entreprise_relationships: "Enterprise Relationships"
+ admin_entreprise_relationships_everything: "Everything"
+ admin_entreprise_relationships_permits: "permits"
+ admin_entreprise_relationships_seach_placeholder: "Search"
+ admin_entreprise_relationships_button_create: "Create"
+ admin_entreprise_groups: "Enterprise Groups"
+ admin_entreprise_groups_name: "Name"
+ admin_entreprise_groups_owner: "Owner"
+ admin_entreprise_groups_on_front_page: "On front page ?"
+ admin_entreprise_groups_entreprise: "Enterprises"
+ admin_entreprise_groups_primary_details: "Primary Details"
+ admin_entreprise_groups_data_powertip: "The primary user responsible for this group."
+ admin_entreprise_groups_data_powertip_logo: "This is the logo for the group"
+ admin_entreprise_groups_data_powertip_promo_image: "This image is displayed at the top of the Group profile"
+ admin_entreprise_groups_about: "About"
+ admin_entreprise_groups_images: "Images"
+ admin_entreprise_groups_contact: "Contact"
+ admin_entreprise_groups_contact_phone_placeholder: "eg. 98 7654 3210"
+ admin_entreprise_groups_contact_address1_placeholder: "eg. 123 High Street"
+ admin_entreprise_groups_contact_city: "Suburb"
+ admin_entreprise_groups_contact_city_placeholder: "eg. Northcote"
+ admin_entreprise_groups_contact_zipcode: "Postcode"
+ admin_entreprise_groups_contact_zipcode_placeholder: "eg. 3070"
+ admin_entreprise_groups_contact_state_id: "State"
+ admin_entreprise_groups_contact_country_id: "Country"
+ admin_entreprise_groups_web: "Web Resources"
+ admin_entreprise_groups_web_twitter: "eg. @the_prof"
+ admin_entreprise_groups_web_website_placeholder: "eg. www.truffles.com"
+ admin_order_cycles: "Admin Order Cycles"
+ open: "Open"
+ close: "Close"
+ supplier: "Supplier"
+ coordinator: "Coordinator"
+ distributor: "Distributor"
+ product: "Products"
+ enterprise_fees: "Enterprise Fees"
+ fee_type: "Fee Type"
+ tax_category: "Tax Category"
+ calculator: "Calculator"
+ calculator_values: "Calculator values"
+ new_order_cycles: "New Order Cycles"
+ select_a_coordinator_for_your_order_cycle: "select a coordinator for your order cycle"
+ edit_order_cycle: "Edit Order Cycle"
+ roles: "Roles"
+ update: "Update"
+ add_producer_property: "Add producer property"
+ admin_settings: "Settings"
+ update_invoice: "Update Invoices"
+ finalise_invoice: "Finalise Invoices"
+ finalise_user_invoices: "Finalise User Invoices"
+ finalise_user_invoice_explained: "Use this button to finalize all invoices in the system for the previous calendar month. This task can be set up to run automatically once a month."
+ manually_run_task: "Manually Run Task "
+ update_user_invoices: "Update User Invoices"
+ update_user_invoice_explained: "Use this button to immediately update invoices for the month to date for each enterprise user in the system. This task can be set up to run automatically every night."
+ auto_finalise_invoices: "Auto-finalise invoices monthly on the 2nd at 1:30am"
+ auto_update_invoices: "Auto-update invoices nightly at 1:00am"
+ in_progress: "In Progress"
+ started_at: "Started at"
+ queued: "Queued"
+ scheduled_for: "Scheduled for"
+ customers: "Customers"
+ please_select_hub: "Please select a Hub"
+ loading_customers: "Loading Customers"
+ no_customers_found: "No customers found"
+ go: "Go"
+ hub: "Hub"
+ accounts_administration_distributor: "accounts administration distributor"
+ accounts_and_billing: "Accounts & Billing"
+ producer: "Producer"
+ product: "Product"
+ price: "Price"
+ on_hand: "On hand"
+ save_changes: "Save Changes"
+ spree_admin_overview_enterprises_header: "My Enterprises"
+ spree_admin_overview_enterprises_footer: "MANAGE MY ENTERPRISES"
+ spree_admin_enterprises_hubs_name: "Name"
+ spree_admin_enterprises_create_new: "CREATE NEW"
+ spree_admin_enterprises_shipping_methods: "Shipping Methods"
+ spree_admin_enterprises_fees: "Enterprise Fees"
+ spree_admin_enterprises_none_create_a_new_enterprise: "CREATE A NEW ENTERPRISE"
+ spree_admin_enterprises_none_text: "You don't have any enterprises yet"
+ spree_admin_enterprises_producers_name: "Name"
+ spree_admin_enterprises_producers_total_products: "Total Products"
+ spree_admin_enterprises_producers_active_products: "Active Products"
+ spree_admin_enterprises_producers_order_cycles: "Products in OCs"
+ spree_admin_enterprises_producers_order_cycles_title: ""
+ spree_admin_enterprises_tabs_hubs: "HUBS"
+ spree_admin_enterprises_tabs_producers: "PRODUCERS"
+ spree_admin_enterprises_producers_manage_order_cycles: "MANAGE ORDER CYCLES"
+ spree_admin_enterprises_producers_manage_products: "MANAGE PRODUCTS"
+ spree_admin_enterprises_producers_orders_cycle_text: "You don't have any active order cycles."
+ spree_admin_enterprises_any_active_products_text: "You don't have any active products."
+ spree_admin_enterprises_create_new_product: "CREATE A NEW PRODUCT"
+ spree_admin_order_cycles: "Order Cycles"
+ spree_admin_order_cycles_tip: "Order cycles determine when and where your products are available to customers."
+ dashbord: "Dashboard"
+ spree_admin_single_enterprise_alert_mail_confirmation: "Please confirm the email address for"
+ spree_admin_single_enterprise_alert_mail_sent: "We've sent an email to"
+ spree_admin_overview_action_required: "Action Required"
+ spree_admin_overview_check_your_inbox: "Please check you inbox for furher instructions. Thanks!"
+ change_package: "Change Package"
+ spree_admin_single_enterprise_hint: "Hint: To allow people to find you, turn on your visibility under"
+ your_profil_live: "Your profile live"
+ on_ofn_map: "on the Open Food Network map"
+ see: "See"
+ live: "live"
+ manage: "Manage"
+ resend: "Resend"
+ add_and_manage_products: "Add & manage products"
+ add_and_manage_order_cycles: "Add & manage order cycles"
+ manage_order_cycles: "Manage order cycles"
+ manage_products: "Manage products"
+ edit_profile_details: "Edit profile details"
+ edit_profile_details_etc: "Change your profile description, images, etc."
+ start_date: "Start Date"
+ end_date: "End Date"
+ order_cycle: "Order Cycle"
+ group_buy_unit_size: "Group Buy Unit Size"
+ total_qtt_ordered: "Total Quantity Ordered"
+ max_qtt_ordered: "Max Quantity Ordered"
+ current_fulfilled_units: "Current Fulfilled Units"
+ max_fulfilled_units: "Max Fulfilled Units"
+ bulk_management_warning: "WARNING: Some variants do not have a unit value"
+ ask: "Ask?"
+ no_orders_found: "No orders found."
+ order_no: "Order No."
+ weight_volume: "Weight/Volume"
+ remove_tax: "Remove tax"
+ tax_settings: "Tax Settings"
+ products_require_tax_category: "products require tax category"
+ admin_shared_address_1: "Address"
+ admin_shared_address_2: "Address (cont.)"
+ admin_share_city: "City"
+ admin_share_zipcode: "Postcode"
+ admin_share_country: "Country"
+ admin_share_state: "State"
+ hub_sidebar_hubs: "Hubs"
+ hub_sidebar_none_available: "None Available"
+ hub_sidebar_manage: "Manage"
+ hub_sidebar_at_least: "At least one hub must be selected"
+ hub_sidebar_blue: "blue"
+ hub_sidebar_red: "red"
+ shop_trial_in_progress: "Your shopfront trial expires in %{days}."
+ shop_trial_expired: "Good news! We have decided to extend shopfront trials until further notice (probably around March 2015)." #FIXME
+ report_customers_distributor: "Distributor"
+ report_customers_supplier: "Supplier"
+ report_customers_cycle: "Order Cycle"
+ report_customers_type: "Report Type"
+ report_customers_csv: "Download as csv"
+ report_producers: "Producers: "
+ report_type: "Report Type: "
+ report_hubs: "Hubs: "
+ report_payment: "Payment Methods: "
+ report_distributor: "Distributor: "
+ report_payment_by: 'Payments By Type'
+ report_itemised_payment: 'Itemised Payment Totals'
+ report_payment_totals: 'Payment Totals'
+ report_all: 'all'
+ report_order_cycle: "Order Cycle: "
+ report_entreprises: "Enterprises: "
+ report_users: "Users: "
+ initial_invoice_number: "Initial invoice number:"
+ invoice_date: "Invoice date:"
+ due_date: "Due date:"
+ account_code: "Account code:"
+ equals: "Equals"
+ contains: "contains"
+ discount: "Discount"
+ filter_products: "Filter Products"
+ delete_product_variant: "The last variant cannot be deleted!"
+ progress: "progress"
+ saving: "Saving.."
+ success: "success"
+ failure: "failure"
+ unsaved_changes_confirmation: "Unsaved changes will be lost. Continue anyway?"
+ one_product_unsaved: "Changes to one product remain unsaved."
+ products_unsaved: "Changes to %{n} products remain unsaved."
+ add_manager: "Add a manager"
+ is_already_manager: "is already a manager!"
+ no_change_to_save: " No change to save"
+ add_manager: "Add a manager"
+ users: "Users"
+ about: "About"
+ images: "Images"
+ contact: "Contact"
+ web: "Web"
+ primary_details: "Primary Details"
+ adrdress: "Address"
+ contact: "Contact"
+ social: "Social"
+ business_details: "Business Details"
+ properties: "Properties"
+ shipping_methods: "Shipping Methods"
+ payment_methods: "Payment Methods"
+ enterprise_fees: "Enterprise Fees"
+ inventory_settings: "Inventory Settings"
+ tag_rules: "Tag Rules"
+ shop_preferences: "Shop Preferences"
+ validation_msg_relationship_already_established: "^That relationship is already established."
+ validation_msg_at_least_one_hub: "^At least one hub must be selected"
+ validation_msg_product_category_cant_be_blank: "^Product Category cant be blank"
+ validation_msg_tax_category_cant_be_blank: "^Tax Category can't be blank"
+ validation_msg_is_associated_with_an_exising_customer: "is associated with an existing customer"
+
+ spree:
+ shipment_states:
+ backorder: backorder
+ partial: partial
+ pending: pending
+ ready: ready
+ shipped: shipped
+ payment_states:
+ balance_due: balance due
+ completed: completed
+ checkout: checkout
+ credit_owed: credit owed
+ failed: failed
+ paid: paid
+ pending: pending
+ processing: processing
+ void: void
+ order_state:
+ address: address
+ adjustments: adjustments
+ awaiting_return: awaiting return
+ canceled: canceled
+ cart: cart
+ complete: complete
+ confirm: confirm
+ delivery: delivery
+ payment: payment
+ resumed: resumed
+ returned: returned
+ skrill: skrill
shop_trial_length: "Shop Trial Length (Days)"
shop_trial_expires_in: "Your shopfront trial expires in"
shop_trial_expired_notice: "Good news! We have decided to extend shopfront trials until further notice (probably around March 2015)."
diff --git a/config/routes.rb b/config/routes.rb
index 9821a8b4bf..8d8d6d27c3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -87,6 +87,8 @@ Openfoodnetwork::Application.routes.draw do
resources :producer_properties do
post :update_positions, on: :collection
end
+
+ resources :tag_rules, only: [:destroy]
end
resources :enterprise_relationships
@@ -113,7 +115,7 @@ Openfoodnetwork::Application.routes.draw do
resources :inventory_items, only: [:create, :update]
- resources :customers, only: [:index, :update]
+ resources :customers, only: [:index, :create, :update, :destroy]
resource :content
@@ -126,6 +128,8 @@ Openfoodnetwork::Application.routes.draw do
resource :business_model_configuration, only: [:edit, :update], controller: 'business_model_configuration'
+ resource :cache_settings
+
resource :account, only: [:show], controller: 'account'
end
@@ -139,6 +143,10 @@ Openfoodnetwork::Application.routes.draw do
get :managed, on: :collection
get :accessible, on: :collection
end
+
+ resource :status do
+ get :job_queue
+ end
end
namespace :open_food_network do
diff --git a/config/schedule.rb b/config/schedule.rb
index a09ca55dce..8cc8d7d225 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -4,8 +4,15 @@ require 'whenever'
env "MAILTO", "rohan@rohanmitchell.com"
+
# If we use -e with a file containing specs, rspec interprets it and filters out our examples
job_type :run_file, "cd :path; :environment_variable=:environment bundle exec script/rails runner :task :output"
+job_type :enqueue_job, "cd :path; :environment_variable=:environment bundle exec script/enqueue :task :priority :output"
+
+
+every 1.hour do
+ rake 'openfoodnetwork:cache:check_products_integrity'
+end
every 1.day, at: '12:05am' do
run_file "lib/open_food_network/integrity_checker.rb"
@@ -19,6 +26,10 @@ every 4.hours do
rake 'db2fog:backup'
end
+every 5.minutes do
+ enqueue_job 'HeartbeatJob', priority: 0
+end
+
every 1.day, at: '1:00am' do
rake 'openfoodnetwork:billing:update_account_invoices'
end
diff --git a/db/migrate/20160204013914_add_id_to_coordinator_fees.rb b/db/migrate/20160204013914_add_id_to_coordinator_fees.rb
new file mode 100644
index 0000000000..74326a6006
--- /dev/null
+++ b/db/migrate/20160204013914_add_id_to_coordinator_fees.rb
@@ -0,0 +1,5 @@
+class AddIdToCoordinatorFees < ActiveRecord::Migration
+ def change
+ add_column :coordinator_fees, :id, :primary_key
+ end
+end
diff --git a/db/migrate/20160303004210_create_tag_rules.rb b/db/migrate/20160303004210_create_tag_rules.rb
new file mode 100644
index 0000000000..157fee1e69
--- /dev/null
+++ b/db/migrate/20160303004210_create_tag_rules.rb
@@ -0,0 +1,10 @@
+class CreateTagRules < ActiveRecord::Migration
+ def change
+ create_table :tag_rules do |t|
+ t.references :enterprise, null: false, index: true
+ t.string :type, null: false
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20160316051131_add_require_login_to_enterprise.rb b/db/migrate/20160316051131_add_require_login_to_enterprise.rb
new file mode 100644
index 0000000000..68de642b62
--- /dev/null
+++ b/db/migrate/20160316051131_add_require_login_to_enterprise.rb
@@ -0,0 +1,5 @@
+class AddRequireLoginToEnterprise < ActiveRecord::Migration
+ def change
+ add_column :enterprises, :require_login, :boolean, default: false, null: false
+ end
+end
diff --git a/db/migrate/20160401043927_change_value_type_of_paypal_passwords.rb b/db/migrate/20160401043927_change_value_type_of_paypal_passwords.rb
new file mode 100644
index 0000000000..e03ed25f9e
--- /dev/null
+++ b/db/migrate/20160401043927_change_value_type_of_paypal_passwords.rb
@@ -0,0 +1,15 @@
+class ChangeValueTypeOfPaypalPasswords < ActiveRecord::Migration
+ def up
+ Spree::Preference
+ .where("key like ?", "spree/gateway/pay_pal_express/password/%")
+ .where(value_type: "string")
+ .update_all(value_type: "password")
+ end
+
+ def down
+ Spree::Preference
+ .where("key like ?", "spree/gateway/pay_pal_express/password/%")
+ .where(value_type: "password")
+ .update_all(value_type: "string")
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c84337565a..dc54bd8f3d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20160302044850) do
+ActiveRecord::Schema.define(:version => 20160401043927) do
create_table "account_invoices", :force => true do |t|
t.integer "user_id", :null => false
@@ -176,7 +176,7 @@ ActiveRecord::Schema.define(:version => 20160302044850) do
add_index "cms_snippets", ["site_id", "identifier"], :name => "index_cms_snippets_on_site_id_and_identifier", :unique => true
add_index "cms_snippets", ["site_id", "position"], :name => "index_cms_snippets_on_site_id_and_position"
- create_table "coordinator_fees", :id => false, :force => true do |t|
+ create_table "coordinator_fees", :force => true do |t|
t.integer "order_cycle_id"
t.integer "enterprise_fee_id"
end
@@ -348,6 +348,7 @@ ActiveRecord::Schema.define(:version => 20160302044850) do
t.string "permalink", :null => false
t.boolean "charges_sales_tax", :default => false, :null => false
t.string "email_address"
+ t.boolean "require_login", :default => false, :null => false
end
add_index "enterprises", ["address_id"], :name => "index_enterprises_on_address_id"
@@ -682,9 +683,9 @@ ActiveRecord::Schema.define(:version => 20160302044850) do
t.string "email"
t.text "special_instructions"
t.integer "distributor_id"
- t.integer "order_cycle_id"
t.string "currency"
t.string "last_ip_address"
+ t.integer "order_cycle_id"
t.integer "cart_id"
t.integer "customer_id"
end
@@ -1146,6 +1147,13 @@ ActiveRecord::Schema.define(:version => 20160302044850) do
t.integer "state_id"
end
+ create_table "tag_rules", :force => true do |t|
+ t.integer "enterprise_id", :null => false
+ t.string "type", :null => false
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
create_table "taggings", :force => true do |t|
t.integer "tag_id"
t.integer "taggable_id"
diff --git a/lib/open_food_network/cached_products_renderer.rb b/lib/open_food_network/cached_products_renderer.rb
new file mode 100644
index 0000000000..2174bf4094
--- /dev/null
+++ b/lib/open_food_network/cached_products_renderer.rb
@@ -0,0 +1,47 @@
+require 'open_food_network/products_renderer'
+
+# Wrapper for ProductsRenderer that caches the JSON output.
+# ProductsRenderer::NoProducts is represented in the cache as nil,
+# but re-raised to provide the same interface as ProductsRenderer.
+
+module OpenFoodNetwork
+ class CachedProductsRenderer
+ class NoProducts < Exception; end
+
+ def initialize(distributor, order_cycle)
+ @distributor = distributor
+ @order_cycle = order_cycle
+ end
+
+ def products_json
+ raise NoProducts.new if @distributor.nil? || @order_cycle.nil?
+
+ products_json = Rails.cache.fetch("products-json-#{@distributor.id}-#{@order_cycle.id}") do
+ log_warning
+
+ begin
+ uncached_products_json
+ rescue ProductsRenderer::NoProducts
+ nil
+ end
+ end
+
+ raise NoProducts.new if products_json.nil?
+
+ products_json
+ end
+
+
+ private
+
+ def log_warning
+ if Rails.env.production? || Rails.env.staging?
+ Bugsnag.notify RuntimeError.new("Live server MISS on products cache for distributor: #{@distributor.id}, order cycle: #{@order_cycle.id}")
+ end
+ end
+
+ def uncached_products_json
+ ProductsRenderer.new(@distributor, @order_cycle).products_json
+ end
+ end
+end
diff --git a/lib/open_food_network/customers_report.rb b/lib/open_food_network/customers_report.rb
index 820bfff7df..d7900a16ac 100644
--- a/lib/open_food_network/customers_report.rb
+++ b/lib/open_food_network/customers_report.rb
@@ -31,7 +31,7 @@ module OpenFoodNetwork
ba.phone,
order.distributor.andand.name,
[da.andand.address1, da.andand.address2, da.andand.city].join(" "),
- order.shipping_method.andand.name
+ order.shipping_method.andand.name
]
end
end
@@ -78,4 +78,3 @@ module OpenFoodNetwork
end
end
end
-
diff --git a/lib/open_food_network/order_cycle_management_report.rb b/lib/open_food_network/order_cycle_management_report.rb
index ea238f7792..8a9c6ba60f 100644
--- a/lib/open_food_network/order_cycle_management_report.rb
+++ b/lib/open_food_network/order_cycle_management_report.rb
@@ -50,7 +50,7 @@ module OpenFoodNetwork
order.shipping_method.andand.name,
order.payments.first.andand.payment_method.andand.name,
order.payments.first.amount,
- OpenFoodNetwork::UserBalanceCalculator.new(order.user, order.distributor).balance
+ OpenFoodNetwork::UserBalanceCalculator.new(order.email, order.distributor).balance
]
end
@@ -67,23 +67,23 @@ module OpenFoodNetwork
order.shipping_method.andand.name,
order.payments.first.andand.payment_method.andand.name,
order.payments.first.amount,
- OpenFoodNetwork::UserBalanceCalculator.new(order.user, order.distributor).balance,
+ OpenFoodNetwork::UserBalanceCalculator.new(order.email, order.distributor).balance,
has_temperature_controlled_items?(order),
order.special_instructions
]
end
def filter_to_payment_method(orders)
- if params[:payment_method_name].present?
- orders.with_payment_method_name(params[:payment_method_name])
+ if params[:payment_method_in].present?
+ orders.joins(payments: :payment_method).where(spree_payments: { payment_method_id: params[:payment_method_in]})
else
orders
end
end
def filter_to_shipping_method(orders)
- if params[:shipping_method_name].present?
- orders.joins(:shipping_method).where("spree_shipping_methods.name = ?", params[:shipping_method_name])
+ if params[:shipping_method_in].present?
+ orders.joins(:shipping_method).where(shipping_method_id: params[:shipping_method_in])
else
orders
end
diff --git a/lib/open_food_network/products_cache.rb b/lib/open_food_network/products_cache.rb
new file mode 100644
index 0000000000..f6ef15829f
--- /dev/null
+++ b/lib/open_food_network/products_cache.rb
@@ -0,0 +1,182 @@
+require 'open_food_network/products_cache_refreshment'
+
+# When elements of the data model change, refresh the appropriate parts of the products cache.
+
+module OpenFoodNetwork
+ class ProductsCache
+ def self.variant_changed(variant)
+ exchanges_featuring_variants(variant).each do |exchange|
+ refresh_cache exchange.receiver, exchange.order_cycle
+ end
+ end
+
+
+ def self.variant_destroyed(variant, &block)
+ exchanges = exchanges_featuring_variants(variant).to_a
+
+ block.call
+
+ exchanges.each do |exchange|
+ refresh_cache exchange.receiver, exchange.order_cycle
+ end
+ end
+
+
+ def self.product_changed(product)
+ exchanges_featuring_variants(product.variants).each do |exchange|
+ refresh_cache exchange.receiver, exchange.order_cycle
+ end
+ end
+
+
+ def self.variant_override_changed(variant_override)
+ exchanges_featuring_variants(variant_override.variant, distributor: variant_override.hub).each do |exchange|
+ refresh_cache exchange.receiver, exchange.order_cycle
+ end
+ end
+
+
+ def self.variant_override_destroyed(variant_override)
+ variant_override_changed variant_override
+ end
+
+
+ def self.producer_property_changed(producer_property)
+ products = producer_property.producer.supplied_products
+ variants = Spree::Variant.
+ where(is_master: false, deleted_at: nil).
+ where(product_id: products)
+
+ exchanges_featuring_variants(variants).each do |exchange|
+ refresh_cache exchange.receiver, exchange.order_cycle
+ end
+ end
+
+
+ def self.producer_property_destroyed(producer_property)
+ producer_property_changed producer_property
+ end
+
+
+ def self.order_cycle_changed(order_cycle)
+ if order_cycle.dated? && !order_cycle.closed?
+ order_cycle.exchanges.outgoing.each do |exchange|
+ refresh_cache exchange.receiver, order_cycle
+ end
+ end
+ end
+
+
+ def self.exchange_changed(exchange)
+ if exchange.incoming
+ refresh_incoming_exchanges(Exchange.where(id: exchange))
+ else
+ refresh_outgoing_exchange(exchange)
+ end
+ end
+
+
+ def self.exchange_destroyed(exchange)
+ exchange_changed exchange
+ end
+
+
+ def self.enterprise_fee_changed(enterprise_fee)
+ refresh_supplier_fee enterprise_fee
+ refresh_coordinator_fee enterprise_fee
+ refresh_distributor_fee enterprise_fee
+ end
+
+
+ def self.distributor_changed(enterprise)
+ Exchange.cachable.where(receiver_id: enterprise).each do |exchange|
+ refresh_cache exchange.receiver, exchange.order_cycle
+ end
+ end
+
+
+ def self.inventory_item_changed(inventory_item)
+ exchanges_featuring_variants(inventory_item.variant, distributor: inventory_item.enterprise).each do |exchange|
+ refresh_cache exchange.receiver, exchange.order_cycle
+ end
+ end
+
+
+ private
+
+ def self.exchanges_featuring_variants(variants, distributor: nil)
+ exchanges = Exchange.
+ outgoing.
+ with_any_variant(variants).
+ joins(:order_cycle).
+ merge(OrderCycle.dated).
+ merge(OrderCycle.not_closed)
+
+ exchanges = exchanges.to_enterprise(distributor) if distributor
+
+ exchanges
+ end
+
+
+ def self.refresh_incoming_exchanges(exchanges)
+ incoming_exchanges(exchanges).map do |exchange|
+ outgoing_exchanges_with_variants(exchange.order_cycle, exchange.variant_ids)
+ end.flatten.uniq.each do |exchange|
+ refresh_cache exchange.receiver, exchange.order_cycle
+ end
+ end
+
+
+ def self.refresh_outgoing_exchange(exchange)
+ if exchange.order_cycle.dated? && !exchange.order_cycle.closed?
+ refresh_cache exchange.receiver, exchange.order_cycle
+ end
+ end
+
+
+ def self.refresh_supplier_fee(enterprise_fee)
+ refresh_incoming_exchanges(enterprise_fee.exchanges)
+ end
+
+
+ def self.refresh_coordinator_fee(enterprise_fee)
+ enterprise_fee.order_cycles.each do |order_cycle|
+ order_cycle_changed order_cycle
+ end
+ end
+
+
+ def self.refresh_distributor_fee(enterprise_fee)
+ enterprise_fee.exchange_fees.
+ joins(:exchange => :order_cycle).
+ merge(Exchange.outgoing).
+ merge(OrderCycle.dated).
+ merge(OrderCycle.not_closed).
+ each do |exf|
+
+ refresh_cache exf.exchange.receiver, exf.exchange.order_cycle
+ end
+ end
+
+
+ def self.incoming_exchanges(exchanges)
+ exchanges.
+ incoming.
+ joins(:order_cycle).
+ merge(OrderCycle.dated).
+ merge(OrderCycle.not_closed)
+ end
+
+
+ def self.outgoing_exchanges_with_variants(order_cycle, variant_ids)
+ order_cycle.exchanges.outgoing.
+ joins(:exchange_variants).
+ where('exchange_variants.variant_id IN (?)', variant_ids)
+ end
+
+
+ def self.refresh_cache(distributor, order_cycle)
+ ProductsCacheRefreshment.refresh distributor, order_cycle
+ end
+ end
+end
diff --git a/lib/open_food_network/products_cache_integrity_checker.rb b/lib/open_food_network/products_cache_integrity_checker.rb
new file mode 100644
index 0000000000..8098124feb
--- /dev/null
+++ b/lib/open_food_network/products_cache_integrity_checker.rb
@@ -0,0 +1,35 @@
+require 'open_food_network/products_renderer'
+
+module OpenFoodNetwork
+ class ProductsCacheIntegrityChecker
+ def initialize(distributor, order_cycle)
+ @distributor = distributor
+ @order_cycle = order_cycle
+ end
+
+ def ok?
+ diff.none?
+ end
+
+ def diff
+ @diff ||= Diffy::Diff.new pretty(cached_json), pretty(rendered_json)
+ end
+
+
+ private
+
+ def cached_json
+ Rails.cache.read("products-json-#{@distributor.id}-#{@order_cycle.id}") || {}.to_json
+ end
+
+ def rendered_json
+ OpenFoodNetwork::ProductsRenderer.new(@distributor, @order_cycle).products_json
+ rescue OpenFoodNetwork::ProductsRenderer::NoProducts
+ nil
+ end
+
+ def pretty(json)
+ JSON.pretty_generate JSON.parse json
+ end
+ end
+end
diff --git a/lib/open_food_network/products_cache_refreshment.rb b/lib/open_food_network/products_cache_refreshment.rb
new file mode 100644
index 0000000000..276734570f
--- /dev/null
+++ b/lib/open_food_network/products_cache_refreshment.rb
@@ -0,0 +1,47 @@
+# When enqueuing a job to refresh the products cache for a particular distribution, there
+# is no benefit in having more than one job waiting in the queue to be run.
+
+# Imagine that an admin updates a product. This calls for the products cache to be
+# updated, otherwise customers will see stale data.
+
+# Now while that update is running, the admin makes another change to the product. Since this change
+# has been made after the previous update started running, the already-running update will not
+# include that change - we need another job. So we enqueue another one.
+
+# Before that job starts running, our zealous admin makes yet another change. This time, there
+# is a job running *and* there is a job that has not yet started to run. In this case, there's no
+# benefit in enqueuing another job. When the previously enqueued job starts running, it will pick up
+# our admin's update and include it. So we ignore this change (from a cache refreshment perspective)
+# and go home happy to have saved our job worker's time.
+
+module OpenFoodNetwork
+ class ProductsCacheRefreshment
+ def self.refresh(distributor, order_cycle)
+ unless pending_job? distributor, order_cycle
+ enqueue_job distributor, order_cycle
+ end
+ end
+
+
+ private
+
+ def self.pending_job?(distributor, order_cycle)
+ # To inspect each job, we need to deserialize the payload.
+ # This is slow, and if it's a problem in practice, we could pre-filter in SQL
+ # for handlers matching the class name, distributor id and order cycle id.
+
+ Delayed::Job.
+ where(locked_at: nil).
+ map(&:payload_object).
+ select { |j|
+ j.class == RefreshProductsCacheJob &&
+ j.distributor_id == distributor.id &&
+ j.order_cycle_id == order_cycle.id
+ }.any?
+ end
+
+ def self.enqueue_job(distributor, order_cycle)
+ Delayed::Job.enqueue RefreshProductsCacheJob.new(distributor.id, order_cycle.id), priority: 10
+ end
+ end
+end
diff --git a/lib/open_food_network/products_renderer.rb b/lib/open_food_network/products_renderer.rb
index d745b1b794..6dd0d5f5ed 100644
--- a/lib/open_food_network/products_renderer.rb
+++ b/lib/open_food_network/products_renderer.rb
@@ -9,8 +9,8 @@ module OpenFoodNetwork
@order_cycle = order_cycle
end
- def products
- products = products_for_shop
+ def products_json
+ products = load_products
if products
enterprise_fee_calculator = EnterpriseFeeCalculator.new @distributor, @order_cycle
@@ -31,7 +31,7 @@ module OpenFoodNetwork
private
- def products_for_shop
+ def load_products
if @order_cycle
scoper = ScopeProductToHub.new(@distributor)
diff --git a/lib/open_food_network/user_balance_calculator.rb b/lib/open_food_network/user_balance_calculator.rb
index 73926c1d03..32cd00c90c 100644
--- a/lib/open_food_network/user_balance_calculator.rb
+++ b/lib/open_food_network/user_balance_calculator.rb
@@ -1,32 +1,30 @@
module OpenFoodNetwork
class UserBalanceCalculator
- def initialize(user, distributor)
- @user = user
+ def initialize(email, distributor)
+ @email = email
@distributor = distributor
end
def balance
- payment_total - order_total
+ payment_total - completed_order_total
end
-
private
- def order_total
- orders.sum &:total
+ def completed_order_total
+ completed_orders.sum &:total
end
def payment_total
payments.sum &:amount
end
-
- def orders
- Spree::Order.where(distributor_id: @distributor, user_id: @user)
+ def completed_orders
+ Spree::Order.where(distributor_id: @distributor, email: @email).complete.not_state(:canceled)
end
def payments
- Spree::Payment.where(order_id: orders)
+ Spree::Payment.where(order_id: completed_orders, state: "completed")
end
end
end
diff --git a/lib/tasks/cache.rake b/lib/tasks/cache.rake
new file mode 100644
index 0000000000..64a5d3909a
--- /dev/null
+++ b/lib/tasks/cache.rake
@@ -0,0 +1,20 @@
+require 'open_food_network/products_cache_integrity_checker'
+
+namespace :openfoodnetwork do
+ namespace :cache do
+ desc 'check the integrity of the products cache'
+ task :check_products_integrity => :environment do
+ Exchange.cachable.each do |exchange|
+ Delayed::Job.enqueue ProductsCacheIntegrityCheckerJob.new(exchange.receiver_id, exchange.order_cycle_id), priority: 20
+ end
+ end
+
+
+ desc 'warm the products cache'
+ task :warm_products => :environment do
+ Exchange.cachable.each do |exchange|
+ Delayed::Job.enqueue RefreshProductsCacheJob.new(exchange.receiver_id, exchange.order_cycle_id), priority: 10
+ end
+ end
+ end
+end
diff --git a/script/enqueue b/script/enqueue
new file mode 100755
index 0000000000..2071414e4e
--- /dev/null
+++ b/script/enqueue
@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+
+# Push a job onto the Delayed Job queue without booting the Rails stack
+# Perfect for calling via cron.
+#
+# Use like this:
+#
+# ./script/enqueue
+# ./script/enqueue Background::ImportJobs
+
+require 'erb'
+require 'yaml'
+
+ENV["RAILS_ENV"] ||= "development"
+
+DATABASE_CONFIG = File.expand_path("../../config/database.yml", __FILE__)
+
+def psql
+ raise "Missing database.yml" unless File.exists?(DATABASE_CONFIG)
+
+ file = File.read(DATABASE_CONFIG)
+ erb = ERB.new(file).result
+ env = ENV["RAILS_ENV"]
+ config = YAML.load(erb)[env]
+
+ raise "Missing config for #{env} environment" unless config
+
+ "psql".tap do |s|
+ s << " --host #{config['host']}" if config['host']
+ s << " --user #{config['username']}" if config['username']
+ s << " --port #{config['port']}" if config['port']
+ s << " #{config['database']}"
+ end
+end
+
+def enqueue_delayed_job(handler, priority=nil)
+ time = Time.now.utc.strftime("%Y-%m-%d %H:%M:%S")
+ priority ||= 50
+
+ sql = <<-SQL
+ INSERT INTO delayed_jobs (
+ handler,
+ created_at,
+ updated_at,
+ run_at,
+ priority
+ ) VALUES (
+ '--- !ruby/object:#{handler} {}\n',
+ '#{time}',
+ '#{time}',
+ '#{time}',
+ #{priority}
+ );
+ SQL
+
+ IO.popen(psql, "w") do |io|
+ io.write sql
+ end
+end
+
+enqueue_delayed_job ARGV[0], ARGV[1]
diff --git a/spec/controllers/admin/customers_controller_spec.rb b/spec/controllers/admin/customers_controller_spec.rb
index bb2e4888c2..f64a8057e8 100644
--- a/spec/controllers/admin/customers_controller_spec.rb
+++ b/spec/controllers/admin/customers_controller_spec.rb
@@ -94,4 +94,45 @@ describe Admin::CustomersController, type: :controller do
end
end
end
+
+ describe "create" do
+ let(:enterprise) { create(:distributor_enterprise) }
+ let(:another_enterprise) { create(:distributor_enterprise) }
+
+ def create_customer(enterprise)
+ spree_put :create, format: :json, customer: { email: 'new@example.com', enterprise_id: enterprise.id }
+ end
+
+ context "json" do
+ context "where I manage the customer's enterprise" do
+ before do
+ controller.stub spree_current_user: enterprise.owner
+ end
+
+ it "allows me to create the customer" do
+ expect { create_customer enterprise }.to change(Customer, :count).by(1)
+ end
+ end
+
+ context "where I don't manage the customer's enterprise" do
+ before do
+ controller.stub spree_current_user: another_enterprise.owner
+ end
+
+ it "prevents me from creating the customer" do
+ expect { create_customer enterprise }.to change(Customer, :count).by(0)
+ end
+ end
+
+ context "where I am the admin user" do
+ before do
+ controller.stub spree_current_user: create(:admin_user)
+ end
+
+ it "allows admins to create the customer" do
+ expect { create_customer enterprise }.to change(Customer, :count).by(1)
+ end
+ end
+ end
+ end
end
diff --git a/spec/controllers/admin/enterprises_controller_spec.rb b/spec/controllers/admin/enterprises_controller_spec.rb
index 8b972a3321..05498010bb 100644
--- a/spec/controllers/admin/enterprises_controller_spec.rb
+++ b/spec/controllers/admin/enterprises_controller_spec.rb
@@ -181,6 +181,58 @@ module Admin
end
end
end
+
+ describe "tag rules" do
+ let(:enterprise) { create(:distributor_enterprise) }
+ let!(:tag_rule) { create(:tag_rule, enterprise: enterprise) }
+
+ before do
+ login_as_enterprise_user [enterprise]
+ end
+
+ context "discount order rules" do
+ it "updates the existing rule with new attributes" do
+ spree_put :update, {
+ id: enterprise,
+ enterprise: {
+ tag_rules_attributes: {
+ '0' => {
+ id: tag_rule,
+ type: "TagRule::DiscountOrder",
+ preferred_customer_tags: "some,new,tags",
+ calculator_type: "Spree::Calculator::FlatPercentItemTotal",
+ calculator_attributes: { id: tag_rule.calculator.id, preferred_flat_percent: "15" }
+ }
+ }
+ }
+ }
+ tag_rule.reload
+ expect(tag_rule.preferred_customer_tags).to eq "some,new,tags"
+ expect(tag_rule.calculator.preferred_flat_percent).to eq 15
+ end
+
+ it "creates new rules with new attributes" do
+ spree_put :update, {
+ id: enterprise,
+ enterprise: {
+ tag_rules_attributes: {
+ '0' => {
+ id: "",
+ type: "TagRule::DiscountOrder",
+ preferred_customer_tags: "tags,are,awesome",
+ calculator_type: "Spree::Calculator::FlatPercentItemTotal",
+ calculator_attributes: { id: "", preferred_flat_percent: "24" }
+ }
+ }
+ }
+ }
+ expect(tag_rule.reload).to be
+ new_tag_rule = TagRule::DiscountOrder.last
+ expect(new_tag_rule.preferred_customer_tags).to eq "tags,are,awesome"
+ expect(new_tag_rule.calculator.preferred_flat_percent).to eq 24
+ end
+ end
+ end
end
context "as owner" do
diff --git a/spec/controllers/admin/tag_rules_controller_spec.rb b/spec/controllers/admin/tag_rules_controller_spec.rb
new file mode 100644
index 0000000000..fa95650479
--- /dev/null
+++ b/spec/controllers/admin/tag_rules_controller_spec.rb
@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Admin::TagRulesController, type: :controller do
+
+ describe "destroy" do
+ context "json" do
+ let(:format) { :json }
+
+ let(:enterprise) { create(:distributor_enterprise) }
+ let!(:tag_rule) { create(:tag_rule, enterprise: enterprise) }
+ let(:params) { { format: format, id: tag_rule.id } }
+
+ context "where I don't manage the tag rule enterprise" do
+ let(:user) { create(:user) }
+
+ before do
+ user.owned_enterprises << create(:enterprise)
+ allow(controller).to receive(:spree_current_user) { user }
+ end
+
+ it "redirects to unauthorized" do
+ spree_delete :destroy, params
+ expect(response).to redirect_to spree.unauthorized_path
+ end
+ end
+
+ context "where I manage the tag rule enterprise" do
+ before do
+ allow(controller).to receive(:spree_current_user) { enterprise.owner }
+ end
+
+ it { expect{ spree_delete :destroy, params }.to change{TagRule.count}.by(-1) }
+ end
+ end
+ end
+end
diff --git a/spec/controllers/api/statuses_controller_spec.rb b/spec/controllers/api/statuses_controller_spec.rb
new file mode 100644
index 0000000000..f2427efb79
--- /dev/null
+++ b/spec/controllers/api/statuses_controller_spec.rb
@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+module Api
+ describe StatusesController do
+ render_views
+
+ describe "job queue status" do
+ it "returns alive when up to date" do
+ Spree::Config.last_job_queue_heartbeat_at = Time.now
+ spree_get :job_queue
+ response.should be_success
+ response.body.should == {alive: true}.to_json
+ end
+
+ it "returns dead otherwise" do
+ Spree::Config.last_job_queue_heartbeat_at = 10.minutes.ago
+ spree_get :job_queue
+ response.should be_success
+ response.body.should == {alive: false}.to_json
+ end
+
+ it "returns dead when no heartbeat recorded" do
+ Spree::Config.last_job_queue_heartbeat_at = nil
+ spree_get :job_queue
+ response.should be_success
+ response.body.should == {alive: false}.to_json
+ end
+ end
+ end
+end
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index 09ea85dd44..73231bc86c 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe ShopController do
- let(:d) { create(:distributor_enterprise) }
+ let(:distributor) { create(:distributor_enterprise) }
it "redirects to the home page if no distributor is selected" do
spree_get :show
@@ -11,26 +11,26 @@ describe ShopController do
describe "with a distributor in place" do
before do
- controller.stub(:current_distributor).and_return d
+ controller.stub(:current_distributor).and_return distributor
end
- describe "Selecting order cycles" do
+ describe "selecting an order cycle" do
it "should select an order cycle when only one order cycle is open" do
- oc1 = create(:simple_order_cycle, distributors: [d])
+ oc1 = create(:simple_order_cycle, distributors: [distributor])
spree_get :show
controller.current_order_cycle.should == oc1
end
it "should not set an order cycle when multiple order cycles are open" do
- oc1 = create(:simple_order_cycle, distributors: [d])
- oc2 = create(:simple_order_cycle, distributors: [d])
+ oc1 = create(:simple_order_cycle, distributors: [distributor])
+ oc2 = create(:simple_order_cycle, distributors: [distributor])
spree_get :show
- controller.current_order_cycle.should == nil
+ controller.current_order_cycle.should be_nil
end
it "should allow the user to post to select the current order cycle" do
- oc1 = create(:simple_order_cycle, distributors: [d])
- oc2 = create(:simple_order_cycle, distributors: [d])
+ oc1 = create(:simple_order_cycle, distributors: [distributor])
+ oc2 = create(:simple_order_cycle, distributors: [distributor])
spree_post :order_cycle, order_cycle_id: oc2.id
response.should be_success
@@ -39,9 +39,10 @@ describe ShopController do
context "JSON tests" do
render_views
- it "should return the order cycle details when the oc is selected" do
- oc1 = create(:simple_order_cycle, distributors: [d])
- oc2 = create(:simple_order_cycle, distributors: [d])
+
+ it "should return the order cycle details when the OC is selected" do
+ oc1 = create(:simple_order_cycle, distributors: [distributor])
+ oc2 = create(:simple_order_cycle, distributors: [distributor])
spree_post :order_cycle, order_cycle_id: oc2.id
response.should be_success
@@ -49,7 +50,7 @@ describe ShopController do
end
it "should return the current order cycle when hit with GET" do
- oc1 = create(:simple_order_cycle, distributors: [d])
+ oc1 = create(:simple_order_cycle, distributors: [distributor])
controller.stub(:current_order_cycle).and_return oc1
spree_get :order_cycle
response.body.should have_content oc1.id
@@ -57,13 +58,13 @@ describe ShopController do
end
it "should not allow the user to select an invalid order cycle" do
- oc1 = create(:simple_order_cycle, distributors: [d])
- oc2 = create(:simple_order_cycle, distributors: [d])
+ oc1 = create(:simple_order_cycle, distributors: [distributor])
+ oc2 = create(:simple_order_cycle, distributors: [distributor])
oc3 = create(:simple_order_cycle, distributors: [create(:distributor_enterprise)])
spree_post :order_cycle, order_cycle_id: oc3.id
response.status.should == 404
- controller.current_order_cycle.should == nil
+ controller.current_order_cycle.should be_nil
end
end
@@ -71,31 +72,32 @@ describe ShopController do
describe "producers/suppliers" do
let(:supplier) { create(:supplier_enterprise) }
let(:product) { create(:product, supplier: supplier) }
- let(:order_cycle) { create(:simple_order_cycle, distributors: [d], coordinator: create(:distributor_enterprise)) }
+ let(:order_cycle) { create(:simple_order_cycle, distributors: [distributor]) }
before do
- exchange = Exchange.find(order_cycle.exchanges.to_enterprises(d).outgoing.first.id)
+ exchange = order_cycle.exchanges.to_enterprises(distributor).outgoing.first
exchange.variants << product.master
end
end
describe "returning products" do
- let(:order_cycle) { create(:simple_order_cycle, distributors: [d], coordinator: create(:distributor_enterprise)) }
- let(:exchange) { Exchange.find(order_cycle.exchanges.to_enterprises(d).outgoing.first.id) }
+ let(:order_cycle) { create(:simple_order_cycle, distributors: [distributor]) }
+ let(:exchange) { order_cycle.exchanges.to_enterprises(distributor).outgoing.first }
describe "requests and responses" do
let(:product) { create(:product) }
+
before do
exchange.variants << product.variants.first
end
- it "returns products via json" do
+ it "returns products via JSON" do
controller.stub(:current_order_cycle).and_return order_cycle
xhr :get, :products
response.should be_success
end
- it "does not return products if no order_cycle is selected" do
+ it "does not return products if no order cycle is selected" do
controller.stub(:current_order_cycle).and_return nil
xhr :get, :products
response.status.should == 404
diff --git a/spec/factories.rb b/spec/factories.rb
index 21c6cecd15..b4a3a1b573 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -60,8 +60,8 @@ FactoryGirl.define do
factory :simple_order_cycle, :class => OrderCycle do
sequence(:name) { |n| "Order Cycle #{n}" }
- orders_open_at { Time.zone.now - 1.day }
- orders_close_at { Time.zone.now + 1.week }
+ orders_open_at { 1.day.ago }
+ orders_close_at { 1.week.from_now }
coordinator { Enterprise.is_distributor.first || FactoryGirl.create(:distributor_enterprise) }
@@ -84,6 +84,26 @@ FactoryGirl.define do
end
end
+ factory :undated_order_cycle, parent: :simple_order_cycle do
+ orders_open_at nil
+ orders_close_at nil
+ end
+
+ factory :upcoming_order_cycle, parent: :simple_order_cycle do
+ orders_open_at { 1.week.from_now }
+ orders_close_at { 2.weeks.from_now }
+ end
+
+ factory :open_order_cycle, parent: :simple_order_cycle do
+ orders_open_at { 1.week.ago }
+ orders_close_at { 1.week.from_now }
+ end
+
+ factory :closed_order_cycle, parent: :simple_order_cycle do
+ orders_open_at { 2.weeks.ago }
+ orders_close_at { 1.week.ago }
+ end
+
factory :exchange, :class => Exchange do
order_cycle { OrderCycle.first || FactoryGirl.create(:simple_order_cycle) }
sender { FactoryGirl.create(:enterprise) }
@@ -197,6 +217,26 @@ FactoryGirl.define do
distributor { create(:distributor_enterprise) }
end
+ factory :order_with_credit_payment, parent: :completed_order_with_totals do
+ distributor { create(:distributor_enterprise)}
+ order_cycle { create(:simple_order_cycle) }
+
+ after(:create) do |order|
+ create(:payment, amount: order.total + 10000, order: order, state: "completed")
+ order.reload
+ end
+ end
+
+ factory :order_without_full_payment, parent: :completed_order_with_totals do
+ distributor { create(:distributor_enterprise)}
+ order_cycle { create(:simple_order_cycle) }
+
+ after(:create) do |order|
+ create(:payment, amount: order.total - 1, order: order, state: "completed")
+ order.reload
+ end
+ end
+
factory :zone_with_member, :parent => :zone do
default_tax true
@@ -245,6 +285,17 @@ FactoryGirl.define do
year { 2000 + rand(100) }
month { 1 + rand(12) }
end
+
+ factory :filter_shipping_methods_tag_rule, class: TagRule::FilterShippingMethods do
+ enterprise { FactoryGirl.create :distributor_enterprise }
+ end
+
+ factory :tag_rule, class: TagRule::DiscountOrder do
+ enterprise { FactoryGirl.create :distributor_enterprise }
+ before(:create) do |tr|
+ tr.calculator = Spree::Calculator::FlatPercentItemTotal.new(calculable: tr)
+ end
+ end
end
diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb
index 767274b274..0b23e77f6c 100644
--- a/spec/features/admin/bulk_order_management_spec.rb
+++ b/spec/features/admin/bulk_order_management_spec.rb
@@ -159,6 +159,7 @@ feature %q{
first("div#columns-dropdown", :text => "COLUMNS").click
first("div#columns-dropdown div.menu div.menu_item", text: "Weight/Volume").click
first("div#columns-dropdown div.menu div.menu_item", text: "Price").click
+ # hide dropdown
first("div#columns-dropdown", :text => "COLUMNS").click
within "tr#li_#{li1.id}" do
expect(page).to have_field "price", with: "$50.00"
diff --git a/spec/features/admin/caching_spec.rb b/spec/features/admin/caching_spec.rb
new file mode 100644
index 0000000000..22d372e19b
--- /dev/null
+++ b/spec/features/admin/caching_spec.rb
@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'open_food_network/products_renderer'
+
+feature 'Caching' do
+ include AuthenticationWorkflow
+ include WebHelper
+
+ before { quick_login_as_admin }
+
+ describe "displaying integrity checker results" do
+ let(:distributor) { create(:distributor_enterprise) }
+ let(:order_cycle) { create(:open_order_cycle, distributors: [distributor]) }
+
+ it "displays results when things are good" do
+ # Given matching data
+ Rails.cache.write "products-json-#{distributor.id}-#{order_cycle.id}", "[1, 2, 3]\n"
+ OpenFoodNetwork::ProductsRenderer.stub(:new) { double(:pr, products_json: "[1, 2, 3]\n") }
+
+ # When I visit the cache status page
+ visit spree.admin_path
+ click_link 'Configuration'
+ click_link 'Caching'
+
+ # Then I should see some status information
+ page.should have_content "OK"
+ end
+
+ it "displays results when there are errors" do
+ # Given matching data
+ Rails.cache.write "products-json-#{distributor.id}-#{order_cycle.id}", "[1, 2, 3]\n"
+ OpenFoodNetwork::ProductsRenderer.stub(:new) { double(:pr, products_json: "[1, 3]\n") }
+
+ # When I visit the cache status page
+ visit spree.admin_path
+ click_link 'Configuration'
+ click_link 'Caching'
+
+ # Then I should see some status information
+ page.should have_content "Error"
+ end
+
+ end
+end
diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb
index 46a0105bb4..3579421b84 100644
--- a/spec/features/admin/enterprises_spec.rb
+++ b/spec/features/admin/enterprises_spec.rb
@@ -82,6 +82,10 @@ feature %q{
page.should have_selector '.available'
choose 'Own'
+ # Require login to view shopfront
+ expect(page).to have_checked_field "enterprise_require_login_false"
+ choose "Require customers to login"
+
within (".side_menu") { click_link "Users" }
select2_search user.email, from: 'Owner'
@@ -162,6 +166,8 @@ feature %q{
page.should have_field 'enterprise_name', :with => 'Eaterprises'
@enterprise.reload
expect(@enterprise.owner).to eq user
+ expect(page).to have_checked_field "enterprise_visible_true"
+ expect(page).to have_checked_field "enterprise_require_login_true"
click_link "Business Details"
page.should have_checked_field "enterprise_charges_sales_tax_true"
@@ -251,6 +257,31 @@ feature %q{
end
+ describe "inventory settings", js: true do
+ let!(:enterprise) { create(:distributor_enterprise) }
+ let!(:product) { create(:simple_product) }
+ let!(:order_cycle) { create(:simple_order_cycle, distributors: [enterprise], variants: [product.variants.first]) }
+
+ before do
+ Delayed::Job.destroy_all
+ quick_login_as_admin
+ end
+
+ it "refreshes the cache when I change what products appear on my shopfront" do
+ # Given a product that's not in my inventory, but is in an active order cycle
+
+ # When I change which products appear on the shopfront
+ visit edit_admin_enterprise_path(enterprise)
+ within(".side_menu") { click_link 'Inventory Settings' }
+ choose 'enterprise_preferred_product_selection_from_inventory_only_1'
+
+ # Then a job should have been enqueued to refresh the cache
+ expect do
+ click_button 'Update'
+ end.to enqueue_job RefreshProductsCacheJob, distributor_id: enterprise.id, order_cycle_id: order_cycle.id
+ end
+ end
+
context "as an Enterprise user", js: true do
let(:supplier1) { create(:supplier_enterprise, name: 'First Supplier') }
let(:supplier2) { create(:supplier_enterprise, name: 'Another Supplier') }
diff --git a/spec/features/admin/payment_method_spec.rb b/spec/features/admin/payment_method_spec.rb
index 5c16f886e5..abb5feaf3e 100644
--- a/spec/features/admin/payment_method_spec.rb
+++ b/spec/features/admin/payment_method_spec.rb
@@ -42,14 +42,33 @@ feature %q{
check "payment_method_distributor_ids_#{@distributors[1].id}"
check "payment_method_distributor_ids_#{@distributors[2].id}"
select2_select "PayPal Express", from: "payment_method_type"
+ expect(page).to have_field 'Login'
+ fill_in 'payment_method_preferred_login', with: 'testlogin'
+ fill_in 'payment_method_preferred_password', with: 'secret'
+ fill_in 'payment_method_preferred_signature', with: 'sig'
+
click_button 'Update'
- flash_message.should eq 'Payment Method has been successfully updated!'
+ expect(flash_message).to eq 'Payment Method has been successfully updated!'
payment_method = Spree::PaymentMethod.find_by_name('New PM Name')
expect(payment_method.distributors).to include @distributors[1], @distributors[2]
expect(payment_method.distributors).not_to include @distributors[0]
expect(payment_method.type).to eq "Spree::Gateway::PayPalExpress"
+ expect(payment_method.preferences[:login]).to eq 'testlogin'
+ expect(payment_method.preferences[:password]).to eq 'secret'
+ expect(payment_method.preferences[:signature]).to eq 'sig'
+
+ fill_in 'payment_method_preferred_login', with: 'otherlogin'
+ click_button 'Update'
+
+ expect(flash_message).to eq 'Payment Method has been successfully updated!'
+ expect(page).to have_field 'Password', with: ''
+
+ payment_method = Spree::PaymentMethod.find_by_name('New PM Name')
+ expect(payment_method.preferences[:login]).to eq 'otherlogin'
+ expect(payment_method.preferences[:password]).to eq 'secret'
+ expect(payment_method.preferences[:signature]).to eq 'sig'
end
end
diff --git a/spec/features/admin/shipping_methods_spec.rb b/spec/features/admin/shipping_methods_spec.rb
index 9f04b6707b..646b383c21 100644
--- a/spec/features/admin/shipping_methods_spec.rb
+++ b/spec/features/admin/shipping_methods_spec.rb
@@ -93,12 +93,16 @@ feature 'shipping methods' do
fill_in 'shipping_method_name', :with => 'Teleport'
check "shipping_method_distributor_ids_#{distributor1.id}"
+ find(:css, "tags-input .tags input").set "local\n"
+
click_button 'Create'
flash_message.should == 'Shipping method "Teleport" has been successfully created!'
+ expect(first('tags-input .tag-list ti-tag-item')).to have_content "local"
shipping_method = Spree::ShippingMethod.find_by_name('Teleport')
shipping_method.distributors.should == [distributor1]
+ shipping_method.tag_list.should == ["local"]
end
it "shows me only shipping methods I have access to" do
diff --git a/spec/features/admin/tag_rules_spec.rb b/spec/features/admin/tag_rules_spec.rb
new file mode 100644
index 0000000000..e91215a21d
--- /dev/null
+++ b/spec/features/admin/tag_rules_spec.rb
@@ -0,0 +1,109 @@
+require 'spec_helper'
+
+feature 'Tag Rules', js: true do
+ include AuthenticationWorkflow
+ include WebHelper
+
+ let!(:enterprise) { create(:distributor_enterprise) }
+
+ context "creating" do
+ before do
+ login_to_admin_section
+ visit main_app.edit_admin_enterprise_path(enterprise)
+ end
+
+ it "allows creation of rules of each type" do
+ click_link "Tag Rules"
+
+ # Creating a new tag
+ expect(page).to_not have_selector '.customer_tag'
+ expect(page).to have_content 'No tags apply to this enterprise yet'
+ click_button '+ Add A New Tag'
+ find(:css, "tags-input .tags input").set "volunteer\n"
+
+ # New FilterShippingMethods Rule
+ click_button '+ Add A New Rule'
+ select2_select 'Show/Hide shipping methods', from: 'rule_type_selector'
+ click_button "Add Rule"
+ select2_select "NOT VISIBLE", from: "enterprise_tag_rules_attributes_0_preferred_matched_shipping_methods_visibility"
+
+ # New DiscountOrder Rule
+ # expect(page).to have_content 'No rules apply to this tag yet'
+ # click_button '+ Add A New Rule'
+ # select2_select 'Apply a discount to orders', from: 'rule_type_selector'
+ # click_button "Add Rule"
+ # fill_in "enterprise_tag_rules_attributes_1_calculator_attributes_preferred_flat_percent", with: 22
+
+ click_button 'Update'
+
+ # tag_rule = TagRule::DiscountOrder.last
+ # expect(tag_rule.preferred_customer_tags).to eq "volunteer"
+ # expect(tag_rule.calculator.preferred_flat_percent).to eq -22
+
+ tag_rule = TagRule::FilterShippingMethods.last
+ expect(tag_rule.preferred_customer_tags).to eq "volunteer"
+ expect(tag_rule.preferred_shipping_method_tags).to eq "volunteer"
+ expect(tag_rule.preferred_matched_shipping_methods_visibility).to eq "hidden"
+ end
+ end
+
+ context "updating" do
+ let!(:do_tag_rule) { create(:tag_rule, enterprise: enterprise, preferred_customer_tags: "member" ) }
+ let!(:fsm_tag_rule) { create(:filter_shipping_methods_tag_rule, enterprise: enterprise, preferred_matched_shipping_methods_visibility: "hidden", preferred_customer_tags: "member" ) }
+
+ before do
+ login_to_admin_section
+ visit main_app.edit_admin_enterprise_path(enterprise)
+ end
+
+ it "saves changes to rules of each type" do
+ click_link "Tag Rules"
+
+ # Tag group exists
+ expect(first('.customer_tag .header')).to have_content "For customers tagged:"
+ expect(first('tags-input .tag-list ti-tag-item')).to have_content "member"
+ find(:css, "tags-input .tags input").set "volunteer\n"
+
+ # DiscountOrder rule
+ expect(page).to have_field "enterprise_tag_rules_attributes_0_calculator_attributes_preferred_flat_percent", with: '0'
+ fill_in "enterprise_tag_rules_attributes_0_calculator_attributes_preferred_flat_percent", with: 45
+
+ # FilterShippingMethods rule
+ expect(page).to have_select2 "enterprise_tag_rules_attributes_1_preferred_matched_shipping_methods_visibility", selected: 'NOT VISIBLE'
+ select2_select 'VISIBLE', from: "enterprise_tag_rules_attributes_1_preferred_matched_shipping_methods_visibility"
+
+ click_button 'Update'
+
+ # DiscountOrder rule
+ expect(do_tag_rule.preferred_customer_tags).to eq "member,volunteer"
+ expect(do_tag_rule.calculator.preferred_flat_percent).to eq -45
+
+ # FilterShippingMethods rule
+ expect(fsm_tag_rule.preferred_customer_tags).to eq "member,volunteer"
+ expect(fsm_tag_rule.preferred_shipping_method_tags).to eq "member,volunteer"
+ expect(fsm_tag_rule.preferred_matched_shipping_methods_visibility).to eq "visible"
+ end
+ end
+
+ context "deleting" do
+ let!(:tag_rule) { create(:tag_rule, enterprise: enterprise, preferred_customer_tags: "member" ) }
+
+ before do
+ login_to_admin_section
+ visit main_app.edit_admin_enterprise_path(enterprise)
+ end
+
+ it "deletes rules from the database" do
+ click_link "Tag Rules"
+
+ expect(page).to have_selector "#tr_#{tag_rule.id}"
+
+ expect{
+ within "#tr_#{tag_rule.id}" do
+ first("a.delete-tag-rule").click
+ end
+ expect(page).to_not have_selector "#tr_#{tag_rule.id}"
+ }.to change{TagRule.count}.by(-1)
+ end
+ end
+end
diff --git a/spec/features/admin/variant_overrides_spec.rb b/spec/features/admin/variant_overrides_spec.rb
index 6f59b78aec..a3a08c2466 100644
--- a/spec/features/admin/variant_overrides_spec.rb
+++ b/spec/features/admin/variant_overrides_spec.rb
@@ -318,7 +318,7 @@ feature %q{
select2_select hub.name, from: 'hub_id'
end
- it "alerts the user to the presence of new products, and allows them to be added or hidden" do
+ it "alerts the user to the presence of new products, and allows them to be added or hidden", retry: 3 do
expect(page).to have_no_selector "table#variant-overrides tr#v_#{variant1.id}"
expect(page).to have_no_selector "table#variant-overrides tr#v_#{variant2.id}"
diff --git a/spec/features/consumer/account_spec.rb b/spec/features/consumer/account_spec.rb
new file mode 100644
index 0000000000..b072a24357
--- /dev/null
+++ b/spec/features/consumer/account_spec.rb
@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+feature %q{
+ As a consumer
+ I want to view my order history with each hub
+ and view any outstanding balance.
+}, js: true do
+ include UIComponentHelper
+ include AuthenticationWorkflow
+ let!(:user) { create(:user)}
+ let!(:user2) {create(:user)}
+ let!(:distributor1) { create(:distributor_enterprise) }
+ let!(:distributor2) { create(:distributor_enterprise) }
+ let!(:distributor_credit) { create(:distributor_enterprise) }
+ let!(:distributor_without_orders) { create(:distributor_enterprise) }
+ let!(:d1o1) { create(:completed_order_with_totals, distributor_id: distributor1.id, user_id: user.id, total: 10000)}
+ let!(:d1o2) { create(:order_without_full_payment, distributor_id: distributor1.id, user_id: user.id, total: 5000)}
+ let!(:d2o1) { create(:completed_order_with_totals, distributor_id: distributor2.id, user_id: user.id)}
+ let!(:credit_order) { create(:order_with_credit_payment, distributor_id: distributor_credit.id, user_id: user.id)}
+# let!(:credit_payment) { create(:payment, amount: 12000.00, order_id: credit_order.id)}
+
+
+ before do
+ credit_order.update!
+ login_as user
+ visit "/account"
+ end
+
+ it "shows all hubs that have been ordered from with balance or credit" do
+ expect(page).to have_content distributor1.name
+ expect(page).to have_content distributor2.name
+ expect(page).not_to have_content distributor_without_orders.name
+ expect(page).to have_content distributor1.name + " " + "Balance due"
+ expect(page).to have_content distributor_credit.name + " Credit"
+ end
+
+ it "reveals table of orders for distributors when clicked" do
+ expand_active_table_node distributor1.name
+ expect(page).to have_link "Order " + d1o1.number, href:"/orders/#{d1o1.number}"
+
+ expand_active_table_node distributor2.name
+ expect(page).not_to have_content "Order " + d1o1.number.to_s
+ end
+
+ context "for a user without orders" do
+ before do
+ login_as user2
+ visit "/account"
+ end
+
+ it "displays an appropriate message" do
+ expect(page).to have_content {t :you_have_no_orders_yet}
+ end
+ end
+
+end
diff --git a/spec/features/consumer/shopping/checkout_spec.rb b/spec/features/consumer/shopping/checkout_spec.rb
index 1df700a1fc..74145bbe1a 100644
--- a/spec/features/consumer/shopping/checkout_spec.rb
+++ b/spec/features/consumer/shopping/checkout_spec.rb
@@ -28,6 +28,7 @@ feature "As a consumer I want to check out my cart", js: true do
describe "with shipping and payment methods" do
let(:sm1) { create(:shipping_method, require_ship_address: true, name: "Frogs", description: "yellow", calculator: Spree::Calculator::FlatRate.new(preferred_amount: 0.00)) }
let(:sm2) { create(:shipping_method, require_ship_address: false, name: "Donkeys", description: "blue", calculator: Spree::Calculator::FlatRate.new(preferred_amount: 4.56)) }
+ let(:sm3) { create(:shipping_method, require_ship_address: false, name: "Local", tag_list: "local") }
let!(:pm1) { create(:payment_method, distributors: [distributor], name: "Roger rabbit", type: "Spree::PaymentMethod::Check") }
let!(:pm2) { create(:payment_method, distributors: [distributor]) }
let!(:pm3) do
@@ -41,6 +42,7 @@ feature "As a consumer I want to check out my cart", js: true do
before do
distributor.shipping_methods << sm1
distributor.shipping_methods << sm2
+ distributor.shipping_methods << sm3
end
context "on the checkout page" do
@@ -68,10 +70,11 @@ feature "As a consumer I want to check out my cart", js: true do
page.should_not have_content product.tax_category.name
end
- it "shows all shipping methods, but doesn't show ship address when not needed" do
+ it "shows all shipping methods" do
toggle_shipping
page.should have_content "Frogs"
page.should have_content "Donkeys"
+ page.should have_content "Local"
end
context "when shipping method requires an address" do
@@ -84,6 +87,39 @@ feature "As a consumer I want to check out my cart", js: true do
find("#ship_address > div.visible").visible?.should be_true
end
end
+
+ context "using FilterShippingMethods" do
+ it "shows shipping methods allowed by the rule" do
+ # No rules in effect
+ toggle_shipping
+ page.should have_content "Frogs"
+ page.should have_content "Donkeys"
+ page.should have_content "Local"
+
+ create(:filter_shipping_methods_tag_rule,
+ enterprise: distributor,
+ preferred_customer_tags: "local",
+ preferred_shipping_method_tags: "local",
+ preferred_matched_shipping_methods_visibility: 'visible')
+ visit checkout_path
+ checkout_as_guest
+
+ # Rule in effect, disallows access to 'Local'
+ page.should have_content "Frogs"
+ page.should have_content "Donkeys"
+ page.should_not have_content "Local"
+
+ customer = create(:customer, enterprise: distributor, tag_list: "local")
+ order.update_attribute(:customer_id, customer.id)
+ visit checkout_path
+ checkout_as_guest
+
+ # #local Customer can access 'Local' shipping method
+ page.should have_content "Frogs"
+ page.should have_content "Donkeys"
+ page.should have_content "Local"
+ end
+ end
end
context "on the checkout page with payments open" do
diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb
index e81a792881..a8545af3db 100644
--- a/spec/features/consumer/shopping/shopping_spec.rb
+++ b/spec/features/consumer/shopping/shopping_spec.rb
@@ -253,5 +253,78 @@ feature "As a consumer I want to shop with a distributor", js: true do
page.should have_content "The next cycle opens in 10 days"
end
end
+
+ context "when shopping requires a customer" do
+ let(:exchange) { Exchange.find(oc1.exchanges.to_enterprises(distributor).outgoing.first.id) }
+ let(:product) { create(:simple_product) }
+ let(:variant) { create(:variant, product: product) }
+
+ before do
+ add_product_and_variant_to_order_cycle(exchange, product, variant)
+ set_order_cycle(order, oc1)
+ distributor.require_login = true
+ distributor.save!
+ end
+
+ context "when not logged in" do
+ it "tells us to login" do
+ visit shop_path
+ expect(page).to have_content "This shop is for customers only."
+ expect(page).to have_content "Please login"
+ expect(page).to have_no_content product.name
+ end
+ end
+
+ context "when logged in" do
+ let(:address) { create(:address, firstname: "Foo", lastname: "Bar") }
+ let(:user) { create(:user, bill_address: address, ship_address: address) }
+
+ before do
+ quick_login_as user
+ end
+
+ context "as non-customer" do
+ it "tells us to contact enterprise" do
+ visit shop_path
+ expect(page).to have_content "This shop is for customers only."
+ expect(page).to have_content "Please contact #{distributor.name}"
+ expect(page).to have_no_content product.name
+ end
+ end
+
+ context "as customer" do
+ let!(:customer) { create(:customer, user: user, enterprise: distributor) }
+
+ it "shows just products" do
+ visit shop_path
+ expect(page).to have_no_content "This shop is for customers only."
+ expect(page).to have_content product.name
+ end
+ end
+
+ context "as a manager" do
+ let!(:role) { create(:enterprise_role, user: user, enterprise: distributor) }
+
+ it "shows just products" do
+ visit shop_path
+ expect(page).to have_no_content "This shop is for customers only."
+ expect(page).to have_content product.name
+ end
+ end
+
+ context "as the owner" do
+ before do
+ distributor.owner = user
+ distributor.save!
+ end
+
+ it "shows just products" do
+ visit shop_path
+ expect(page).to have_no_content "This shop is for customers only."
+ expect(page).to have_content product.name
+ end
+ end
+ end
+ end
end
end
diff --git a/spec/features/consumer/shops_spec.rb b/spec/features/consumer/shops_spec.rb
index faeff9c37d..4edaa702e0 100644
--- a/spec/features/consumer/shops_spec.rb
+++ b/spec/features/consumer/shops_spec.rb
@@ -26,9 +26,17 @@ feature 'Shops', js: true do
page.should_not have_content invisible_distributor.name
end
- it "should grey out hubs that are not in an order cycle" do
+ it "should not show hubs that are not in an order cycle" do
create(:simple_product, distributors: [d1, d2])
visit shops_path
+ page.should have_no_selector 'hub.inactive'
+ page.should have_no_selector 'hub', text: d2.name
+ end
+
+ it "should show closed shops after clicking the button" do
+ create(:simple_product, distributors: [d1, d2])
+ visit shops_path
+ click_link "Show closed shops"
page.should have_selector 'hub.inactive'
page.should have_selector 'hub.inactive', text: d2.name
end
diff --git a/spec/helpers/enterprises_helper_spec.rb b/spec/helpers/enterprises_helper_spec.rb
new file mode 100644
index 0000000000..1dc32d63b3
--- /dev/null
+++ b/spec/helpers/enterprises_helper_spec.rb
@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe EnterprisesHelper do
+ describe "loading available shipping methods" do
+
+ context "when a FilterShippingMethods tag rule is in effect, with preferred visibility of 'visible'" do
+ let!(:distributor) { create(:distributor_enterprise) }
+ let!(:allowed_customer) { create(:customer, enterprise: distributor, tag_list: "local") }
+ let!(:disallowed_customer) { create(:customer, enterprise: distributor, tag_list: "") }
+ let!(:order) { create(:order, distributor: distributor) }
+ let!(:tag_rule) { create(:filter_shipping_methods_tag_rule,
+ enterprise: distributor,
+ preferred_customer_tags: "local",
+ preferred_shipping_method_tags: "local-delivery") }
+ let!(:tagged_sm) { create(:shipping_method, require_ship_address: false, name: "Untagged", tag_list: "local-delivery") }
+ let!(:untagged_sm) { create(:shipping_method, require_ship_address: false, name: "Tagged", tag_list: "") }
+
+ before do
+ distributor.shipping_methods = [tagged_sm, untagged_sm]
+ allow(helper).to receive(:current_order) { order }
+ end
+
+ context "with a preferred visiblity of 'visible" do
+ before { tag_rule.update_attribute(:preferred_matched_shipping_methods_visibility, 'visible') }
+
+ context "when the customer is nil" do
+ it "applies default action (hide)" do
+ expect(helper.available_shipping_methods).to include untagged_sm
+ expect(helper.available_shipping_methods).to_not include tagged_sm
+ end
+ end
+
+ context "when the customer's tags match" do
+ before { order.update_attribute(:customer_id, allowed_customer.id) }
+
+ it "applies the action (show)" do
+ expect(helper.available_shipping_methods).to include tagged_sm, untagged_sm
+ end
+ end
+
+ context "when the customer's tags don't match" do
+ before { order.update_attribute(:customer_id, disallowed_customer.id) }
+
+ it "applies the default action (hide)" do
+ expect(helper.available_shipping_methods).to include untagged_sm
+ expect(helper.available_shipping_methods).to_not include tagged_sm
+ end
+ end
+ end
+
+ context "with a preferred visiblity of 'hidden" do
+ before { tag_rule.update_attribute(:preferred_matched_shipping_methods_visibility, 'hidden') }
+
+ context "when the customer is nil" do
+ it "applies default action (show)" do
+ expect(helper.available_shipping_methods).to include tagged_sm, untagged_sm
+ end
+ end
+
+ context "when the customer's tags match" do
+ before { order.update_attribute(:customer_id, allowed_customer.id) }
+
+ it "applies the action (hide)" do
+ expect(helper.available_shipping_methods).to include untagged_sm
+ expect(helper.available_shipping_methods).to_not include tagged_sm
+ end
+ end
+
+ context "when the customer's tags don't match" do
+ before { order.update_attribute(:customer_id, disallowed_customer.id) }
+
+ it "applies the default action (show)" do
+ expect(helper.available_shipping_methods).to include tagged_sm, untagged_sm
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/spec/helpers/injection_helper_spec.rb b/spec/helpers/injection_helper_spec.rb
index 362ca6479b..3b62fb2660 100644
--- a/spec/helpers/injection_helper_spec.rb
+++ b/spec/helpers/injection_helper_spec.rb
@@ -3,6 +3,13 @@ require 'spec_helper'
describe InjectionHelper do
let!(:enterprise) { create(:distributor_enterprise, facebook: "roger") }
+ let!(:distributor1) { create(:distributor_enterprise) }
+ let!(:distributor2) { create(:distributor_enterprise) }
+ let!(:user) { create(:user)}
+ let!(:d1o1) { create(:completed_order_with_totals, distributor: distributor1, user_id: user.id, total: 10000)}
+ let!(:d1o2) { create(:completed_order_with_totals, distributor: distributor1, user_id: user.id, total: 5000)}
+ let!(:d2o1) { create(:completed_order_with_totals, distributor: distributor2, user_id: user.id)}
+
it "will inject via AMS" do
helper.inject_json_ams("test", [enterprise], Api::IdSerializer).should match /#{enterprise.id}/
end
@@ -20,7 +27,10 @@ describe InjectionHelper do
it "injects shipping_methods" do
sm = create(:shipping_method)
helper.stub(:current_order).and_return order = create(:order)
- helper.stub_chain(:current_distributor, :shipping_methods, :uniq).and_return [sm]
+ shipping_methods = double(:shipping_methods, uniq: [sm])
+ current_distributor = double(:distributor, shipping_methods: shipping_methods)
+ allow(helper).to receive(:current_distributor) { current_distributor }
+ allow(current_distributor).to receive(:apply_tag_rules_to).with(shipping_methods, {customer: nil} )
helper.inject_available_shipping_methods.should match sm.id.to_s
helper.inject_available_shipping_methods.should match sm.compute_amount(order).to_s
end
@@ -42,8 +52,4 @@ describe InjectionHelper do
helper.inject_taxons.should match taxon.name
end
- it "injects taxons" do
- taxon = create(:taxon)
- helper.inject_taxons.should match taxon.name
- end
end
diff --git a/spec/javascripts/unit/admin/customers/controllers/customers_controller_spec.js.coffee b/spec/javascripts/unit/admin/customers/controllers/customers_controller_spec.js.coffee
index 22777a6528..215f2834ed 100644
--- a/spec/javascripts/unit/admin/customers/controllers/customers_controller_spec.js.coffee
+++ b/spec/javascripts/unit/admin/customers/controllers/customers_controller_spec.js.coffee
@@ -1,25 +1,49 @@
describe "CustomersCtrl", ->
- ctrl = null
scope = null
- Customers = null
+ http = null
beforeEach ->
- shops = "list of shops"
-
module('admin.customers')
- inject ($controller, $rootScope, _Customers_) ->
+ inject ($controller, $rootScope, _CustomerResource_, $httpBackend) ->
scope = $rootScope
- Customers = _Customers_
- ctrl = $controller 'customersCtrl', {$scope: scope, Customers: Customers, shops: shops}
+ http = $httpBackend
+ $controller 'customersCtrl', {$scope: scope, CustomerResource: _CustomerResource_, shops: {}}
+ this.addMatchers
+ toAngularEqual: (expected) ->
+ return angular.equals(this.actual, expected)
+
+ it "has no shop pre-selected", ->
+ expect(scope.shop).toEqual {}
describe "setting the shop on scope", ->
+ customer = { id: 5, email: 'someone@email.com'}
+ customers = [customer]
+
beforeEach ->
- spyOn(Customers, "index").andReturn "list of customers"
+ http.expectGET('/admin/customers.json?enterprise_id=1').respond 200, customers
scope.$apply ->
scope.shop = {id: 1}
+ http.flush()
- it "calls Customers#index with the correct params", ->
- expect(Customers.index).toHaveBeenCalledWith({enterprise_id: 1})
+ it "retrievs the list of customers", ->
+ expect(scope.customers).toAngularEqual customers
- it "resets $scope.customers with the result of Customers#index", ->
- expect(scope.customers).toEqual "list of customers"
+ describe "scope.add", ->
+ it "creates a new customer", ->
+ email = "customer@example.org"
+ newCustomer = {id: 6, email: email}
+ customers.push(newCustomer)
+ http.expectPOST('/admin/customers.json?email=' + email + '&enterprise_id=1').respond 200, newCustomer
+ scope.add(email)
+ http.flush()
+ expect(scope.customers).toAngularEqual customers
+
+ describe "scope.deleteCustomer", ->
+ it "deletes a customer", ->
+ expect(scope.customers.length).toBe 2
+ customer = scope.customers[0]
+ http.expectDELETE('/admin/customers/' + customer.id + '.json').respond 200
+ scope.deleteCustomer(customer)
+ http.flush()
+ expect(scope.customers.length).toBe 1
+ expect(scope.customers[0]).not.toAngularEqual customer
diff --git a/spec/javascripts/unit/admin/customers/services/customers_spec.js.coffee b/spec/javascripts/unit/admin/customers/services/customers_spec.js.coffee
deleted file mode 100644
index 7123055d63..0000000000
--- a/spec/javascripts/unit/admin/customers/services/customers_spec.js.coffee
+++ /dev/null
@@ -1,31 +0,0 @@
-describe "Customers service", ->
- Customers = CustomerResource = customers = $httpBackend = null
-
- beforeEach ->
- module 'admin.customers'
-
- inject ($q, _$httpBackend_, _Customers_, _CustomerResource_) ->
- Customers = _Customers_
- CustomerResource = _CustomerResource_
- $httpBackend = _$httpBackend_
- $httpBackend.expectGET('/admin/customers.json?enterprise_id=2').respond 200, [{ id: 5, email: 'someone@email.com'}]
-
- describe "#index", ->
- result = null
-
- beforeEach ->
- expect(Customers.loaded).toBe false
- result = Customers.index(enterprise_id: 2)
- $httpBackend.flush()
-
- it "stores returned data in @customers, with ids as keys", ->
- # This is super weird and freaking annoying. I think resource results have extra
- # properties ($then, $promise) that cause them to not be equal to the reponse object
- # provided to the expectGET clause above.
- expect(Customers.customers).toEqual [ new CustomerResource({ id: 5, email: 'someone@email.com'}) ]
-
- it "returns @customers", ->
- expect(result).toEqual Customers.customers
-
- it "sets @loaded to true", ->
- expect(Customers.loaded).toBe true
diff --git a/spec/javascripts/unit/admin/inventory_items/services/inventory_items_spec.js.coffee b/spec/javascripts/unit/admin/inventory_items/services/inventory_items_spec.js.coffee
index 49ea827900..61d002f23a 100644
--- a/spec/javascripts/unit/admin/inventory_items/services/inventory_items_spec.js.coffee
+++ b/spec/javascripts/unit/admin/inventory_items/services/inventory_items_spec.js.coffee
@@ -8,10 +8,6 @@ describe "InventoryItems service", ->
$provide.value 'inventoryItems', inventoryItems
null
- this.addMatchers
- toDeepEqual: (expected) ->
- return angular.equals(this.actual, expected)
-
inject ($q, _$httpBackend_, _InventoryItems_, _InventoryItemResource_) ->
InventoryItems = _InventoryItems_
InventoryItemResource = _InventoryItemResource_
diff --git a/spec/javascripts/unit/admin/tag_rules/controllers/tag_rules_controller_spec.js.coffee b/spec/javascripts/unit/admin/tag_rules/controllers/tag_rules_controller_spec.js.coffee
new file mode 100644
index 0000000000..1e132ec07d
--- /dev/null
+++ b/spec/javascripts/unit/admin/tag_rules/controllers/tag_rules_controller_spec.js.coffee
@@ -0,0 +1,79 @@
+describe "TagRulesCtrl", ->
+ ctrl = null
+ scope = null
+ enterprise = null
+
+ beforeEach ->
+ module('admin.tagRules')
+ enterprise =
+ id: 45
+ tag_groups: [
+ { tags: "member", rules: [{ id: 1, preferred_customer_tags: "member" }, { id: 2, preferred_customer_tags: "member" }] },
+ { tags: "volunteer", rules: [{ id: 3, preferred_customer_tags: "local" }] }
+ ]
+
+ inject ($rootScope, $controller) ->
+ scope = $rootScope
+ ctrl = $controller 'TagRulesCtrl', {$scope: scope, enterprise: enterprise}
+
+ describe "tagGroup start indices", ->
+ it "updates on initialization", ->
+ expect(scope.tagGroups[0].startIndex).toEqual 0
+ expect(scope.tagGroups[1].startIndex).toEqual 2
+
+ describe "adding a new tag group", ->
+ beforeEach ->
+ scope.addNewRuleTo(scope.tagGroups[0], "DiscountOrder")
+
+ it "adds a new rule of the specified type to the rules array for the tagGroup", ->
+ expect(scope.tagGroups[0].rules.length).toEqual 3
+ expect(scope.tagGroups[0].rules[2].type).toEqual "TagRule::DiscountOrder"
+
+ it "updates tagGroup start indices", ->
+ expect(scope.tagGroups[0].startIndex).toEqual 0
+ expect(scope.tagGroups[1].startIndex).toEqual 3
+
+ describe "deleting a tag group", ->
+ describe "where the rule is not in the rule list for the tagGroup", ->
+ beforeEach ->
+ scope.deleteTagRule(scope.tagGroups[0],scope.tagGroups[1].rules[0])
+
+ it "does not remove any rules", ->
+ expect(scope.tagGroups[0].rules.length).toEqual 2
+ expect(scope.tagGroups[1].rules.length).toEqual 1
+
+ describe "with an id", ->
+ rule = null
+
+ beforeEach inject ($httpBackend) ->
+ rule = scope.tagGroups[0].rules[0]
+ spyOn(window, "confirm").andReturn(true)
+ $httpBackend.expectDELETE('/admin/enterprises/45/tag_rules/1.json').respond(status: 204)
+ scope.deleteTagRule(scope.tagGroups[0], rule)
+ $httpBackend.flush()
+
+ it "removes the specified rule from the rules list", ->
+ expect(scope.tagGroups[0].rules.length).toEqual 1
+ expect(scope.tagGroups[1].rules.length).toEqual 1
+ expect(scope.tagGroups[0].rules.indexOf(rule)).toEqual -1
+
+ it "updates tagGroup start indices", ->
+ expect(scope.tagGroups[0].startIndex).toEqual 0
+ expect(scope.tagGroups[1].startIndex).toEqual 1
+
+ describe "without an id", ->
+ rule = null
+
+ beforeEach inject ($httpBackend) ->
+ rule = scope.tagGroups[0].rules[0]
+ rule.id = null
+ scope.deleteTagRule(scope.tagGroups[0], rule)
+
+ it "removes the specified rule from the rules list", ->
+ expect(scope.tagGroups[0].rules.length).toEqual 1
+ expect(scope.tagGroups[1].rules.length).toEqual 1
+ expect(scope.tagGroups[0].rules.indexOf(rule)).toEqual -1
+
+ it "updates tagGroup start indices", ->
+ expect(scope.tagGroups[0].startIndex).toEqual 0
+ expect(scope.tagGroups[1].startIndex).toEqual 1
diff --git a/spec/javascripts/unit/darkswarm/services/map_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/map_spec.js.coffee
index 4252000460..669f0ca74d 100644
--- a/spec/javascripts/unit/darkswarm/services/map_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/map_spec.js.coffee
@@ -9,6 +9,17 @@ describe "Hubs service", ->
orders_close_at: new Date()
type: "hub"
visible: true
+ latitude: 0
+ longitude: 0
+ }
+ {
+ id: 3
+ active: false
+ orders_close_at: new Date()
+ type: "hub"
+ visible: true
+ latitude: null
+ longitude: null
}
]
@@ -24,3 +35,6 @@ describe "Hubs service", ->
it "builds MapMarkers from enterprises", ->
expect(OfnMap.enterprises[0].id).toBe enterprises[0].id
+
+ it "excludes enterprises without latitude or longitude", ->
+ expect(OfnMap.enterprises.map (e) -> e.id).not.toContain enterprises[1].id
diff --git a/spec/jobs/heartbeat_job_spec.rb b/spec/jobs/heartbeat_job_spec.rb
new file mode 100644
index 0000000000..3bafecd572
--- /dev/null
+++ b/spec/jobs/heartbeat_job_spec.rb
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe HeartbeatJob do
+ context "with time frozen" do
+ let(:run_time) { Time.zone.local(2016, 4, 13, 13, 0, 0) }
+
+ before { Spree::Config.last_job_queue_heartbeat_at = nil }
+
+ around do |example|
+ Timecop.freeze(run_time) { example.run }
+ end
+
+ it "updates the last_job_queue_heartbeat_at config var" do
+ run_job
+ Time.parse(Spree::Config.last_job_queue_heartbeat_at).should == run_time
+ end
+ end
+
+
+ private
+
+ def run_job
+ clear_jobs
+ Delayed::Job.enqueue HeartbeatJob.new
+ flush_jobs ignore_exceptions: false
+ end
+end
diff --git a/spec/jobs/products_cache_integrity_checker_job_spec.rb b/spec/jobs/products_cache_integrity_checker_job_spec.rb
new file mode 100644
index 0000000000..1770f9bf84
--- /dev/null
+++ b/spec/jobs/products_cache_integrity_checker_job_spec.rb
@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'open_food_network/products_renderer'
+
+describe ProductsCacheIntegrityCheckerJob do
+ describe "reporting on differences between the products cache and the current products" do
+ let(:distributor) { create(:distributor_enterprise) }
+ let(:order_cycle) { create(:simple_order_cycle) }
+ let(:job) { ProductsCacheIntegrityCheckerJob.new distributor.id, order_cycle.id }
+
+ before do
+ Rails.cache.write "products-json-#{distributor.id}-#{order_cycle.id}", "[1, 2, 3]\n"
+ OpenFoodNetwork::ProductsRenderer.stub(:new) { double(:pr, products_json: "[1, 3]\n") }
+ end
+
+ it "reports errors" do
+ expect(Bugsnag).to receive(:notify)
+ run_job job
+ end
+
+ it "deals with nil cached_json" do
+ Rails.cache.clear
+ expect(Bugsnag).to receive(:notify)
+ run_job job
+ end
+ end
+end
diff --git a/spec/jobs/refresh_products_cache_job_spec.rb b/spec/jobs/refresh_products_cache_job_spec.rb
new file mode 100644
index 0000000000..d20efe5fad
--- /dev/null
+++ b/spec/jobs/refresh_products_cache_job_spec.rb
@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'open_food_network/products_renderer'
+
+describe RefreshProductsCacheJob do
+ let(:distributor) { create(:distributor_enterprise) }
+ let(:order_cycle) { create(:simple_order_cycle) }
+
+ it "renders products and writes them to cache" do
+ RefreshProductsCacheJob.any_instance.stub(:products_json) { 'products' }
+
+ run_job RefreshProductsCacheJob.new distributor.id, order_cycle.id
+
+ expect(Rails.cache.read("products-json-#{distributor.id}-#{order_cycle.id}")).to eq 'products'
+ end
+
+ describe "fetching products JSON" do
+ let(:job) { RefreshProductsCacheJob.new distributor.id, order_cycle.id }
+ let(:pr) { double(:products_renderer, products_json: nil) }
+
+ it "fetches products JSON" do
+ expect(OpenFoodNetwork::ProductsRenderer).to receive(:new).with(distributor, order_cycle) { pr }
+ job.send(:products_json)
+ end
+ end
+end
diff --git a/spec/lib/open_food_network/cached_products_renderer_spec.rb b/spec/lib/open_food_network/cached_products_renderer_spec.rb
new file mode 100644
index 0000000000..03b0ab05d5
--- /dev/null
+++ b/spec/lib/open_food_network/cached_products_renderer_spec.rb
@@ -0,0 +1,111 @@
+require 'spec_helper'
+require 'open_food_network/cached_products_renderer'
+require 'open_food_network/products_renderer'
+
+module OpenFoodNetwork
+ describe CachedProductsRenderer do
+ let(:distributor) { double(:distributor, id: 123) }
+ let(:order_cycle) { double(:order_cycle, id: 456) }
+ let(:cpr) { CachedProductsRenderer.new(distributor, order_cycle) }
+
+ describe "when the distribution is not set" do
+ let(:cpr) { CachedProductsRenderer.new(nil, nil) }
+
+ it "raises an exception and returns no products" do
+ expect { cpr.products_json }.to raise_error CachedProductsRenderer::NoProducts
+ end
+ end
+
+ describe "when the products JSON is already cached" do
+ before do
+ Rails.cache.write "products-json-#{distributor.id}-#{order_cycle.id}", 'products'
+ end
+
+ it "returns the cached JSON" do
+ expect(cpr.products_json).to eq 'products'
+ end
+
+ it "raises an exception when there are no products" do
+ Rails.cache.write "products-json-#{distributor.id}-#{order_cycle.id}", nil
+ expect { cpr.products_json }.to raise_error CachedProductsRenderer::NoProducts
+ end
+ end
+
+ describe "when the products JSON is not cached" do
+ let(:cached_json) { Rails.cache.read "products-json-#{distributor.id}-#{order_cycle.id}" }
+ let(:cache_present) { Rails.cache.exist? "products-json-#{distributor.id}-#{order_cycle.id}" }
+
+ before do
+ Rails.cache.clear
+ cpr.stub(:uncached_products_json) { 'fresh products' }
+ end
+
+ describe "when there are products" do
+ it "returns products as JSON" do
+ expect(cpr.products_json).to eq 'fresh products'
+ end
+
+ it "caches the JSON" do
+ cpr.products_json
+ expect(cached_json).to eq 'fresh products'
+ end
+
+ it "logs a warning" do
+ cpr.should_receive :log_warning
+ cpr.products_json
+ end
+ end
+
+ describe "when there are no products" do
+ before { cpr.stub(:uncached_products_json).and_raise ProductsRenderer::NoProducts }
+
+ it "raises an error" do
+ expect { cpr.products_json }.to raise_error CachedProductsRenderer::NoProducts
+ end
+
+ it "caches the products as nil" do
+ expect { cpr.products_json }.to raise_error CachedProductsRenderer::NoProducts
+ expect(cache_present).to be
+ expect(cached_json).to be_nil
+ end
+
+ it "logs a warning" do
+ cpr.should_receive :log_warning
+ expect { cpr.products_json }.to raise_error CachedProductsRenderer::NoProducts
+ end
+ end
+ end
+
+ describe "logging a warning" do
+ it "logs a warning when in production" do
+ Rails.env.stub(:production?) { true }
+ expect(Bugsnag).to receive(:notify)
+ cpr.send(:log_warning)
+ end
+
+ it "logs a warning when in staging" do
+ Rails.env.stub(:production?) { false }
+ Rails.env.stub(:staging?) { true }
+ expect(Bugsnag).to receive(:notify)
+ cpr.send(:log_warning)
+ end
+
+ it "does not log a warning in development or test" do
+ expect(Bugsnag).to receive(:notify).never
+ cpr.send(:log_warning)
+ end
+ end
+
+ describe "fetching uncached products from ProductsRenderer" do
+ let(:pr) { double(:products_renderer, products_json: 'uncached products') }
+
+ before do
+ ProductsRenderer.stub(:new) { pr }
+ end
+
+ it "returns the uncached products" do
+ expect(cpr.send(:uncached_products_json)).to eq 'uncached products'
+ end
+ end
+ end
+end
diff --git a/spec/lib/open_food_network/order_cycle_management_report_spec.rb b/spec/lib/open_food_network/order_cycle_management_report_spec.rb
index e0e7cb40bf..99ebf575af 100644
--- a/spec/lib/open_food_network/order_cycle_management_report_spec.rb
+++ b/spec/lib/open_food_network/order_cycle_management_report_spec.rb
@@ -86,19 +86,23 @@ module OpenFoodNetwork
it "filters to a payment method" do
pm2 = create(:payment_method, name: "PM2")
- order2 = create(:order)
- payment2 = create(:payment, order: order2, payment_method: pm2)
+ pm3 = create(:payment_method, name: "PM3")
+ order2 = create(:order, payments: [create(:payment, payment_method: pm2)])
+ order3 = create(:order, payments: [create(:payment, payment_method: pm3)])
+ # payment2 = create(:payment, order: order2, payment_method: pm2)
- subject.stub(:params).and_return(payment_method_name: pm1.name)
- subject.filter(orders).should == [order1]
+ subject.stub(:params).and_return(payment_method_in: [pm1.id, pm3.id] )
+ subject.filter(orders).should match_array [order1, order3]
end
it "filters to a shipping method" do
sm2 = create(:shipping_method, name: "ship2")
+ sm3 = create(:shipping_method, name: "ship3")
order2 = create(:order, shipping_method: sm2)
+ order3 = create(:order, shipping_method: sm3)
- subject.stub(:params).and_return(shipping_method_name: sm1.name)
- subject.filter(orders).should == [order1]
+ subject.stub(:params).and_return(shipping_method_in: [sm1.id, sm3.id])
+ expect(subject.filter(orders)).to match_array [order1, order3]
end
it "should do all the filters at once" do
diff --git a/spec/lib/open_food_network/products_cache_refreshment_spec.rb b/spec/lib/open_food_network/products_cache_refreshment_spec.rb
new file mode 100644
index 0000000000..f65b81346e
--- /dev/null
+++ b/spec/lib/open_food_network/products_cache_refreshment_spec.rb
@@ -0,0 +1,68 @@
+require 'open_food_network/products_cache_refreshment'
+
+module OpenFoodNetwork
+ describe ProductsCacheRefreshment do
+ let(:distributor) { create(:distributor_enterprise) }
+ let(:order_cycle) { create(:simple_order_cycle) }
+
+ before { Delayed::Job.destroy_all }
+
+ describe "when there are no tasks enqueued" do
+ it "enqueues the task" do
+ expect do
+ ProductsCacheRefreshment.refresh distributor, order_cycle
+ end.to enqueue_job RefreshProductsCacheJob
+ end
+
+ it "enqueues the job with a lower than default priority" do
+ ProductsCacheRefreshment.refresh distributor, order_cycle
+ job = Delayed::Job.last
+ expect(job.priority).to be > Delayed::Worker.default_priority
+ end
+ end
+
+ describe "when there is an enqueued task, and it is running" do
+ before do
+ job = Delayed::Job.enqueue RefreshProductsCacheJob.new distributor.id, order_cycle.id
+ job.update_attributes! locked_by: 'asdf', locked_at: Time.now
+ end
+
+ it "enqueues another task" do
+ expect do
+ ProductsCacheRefreshment.refresh distributor, order_cycle
+ end.to enqueue_job RefreshProductsCacheJob
+ end
+ end
+
+ describe "when there are two enqueued tasks, and one is running" do
+ before do
+ job1 = Delayed::Job.enqueue RefreshProductsCacheJob.new distributor.id, order_cycle.id
+ job1.update_attributes! locked_by: 'asdf', locked_at: Time.now
+ job2 = Delayed::Job.enqueue RefreshProductsCacheJob.new distributor.id, order_cycle.id
+ end
+
+ it "does not enqueue another task" do
+ expect do
+ ProductsCacheRefreshment.refresh distributor, order_cycle
+ end.not_to enqueue_job RefreshProductsCacheJob
+ end
+ end
+
+ describe "enqueuing tasks with different distributions" do
+ let(:distributor2) { create(:distributor_enterprise) }
+ let(:order_cycle2) { create(:simple_order_cycle) }
+
+ before do
+ job1 = Delayed::Job.enqueue RefreshProductsCacheJob.new distributor.id, order_cycle.id
+ job1.update_attributes! locked_by: 'asdf', locked_at: Time.now
+ job2 = Delayed::Job.enqueue RefreshProductsCacheJob.new distributor.id, order_cycle.id
+ end
+
+ it "ignores tasks with differing distributions when choosing whether to enqueue a job" do
+ expect do
+ ProductsCacheRefreshment.refresh distributor2, order_cycle2
+ end.to enqueue_job RefreshProductsCacheJob
+ end
+ end
+ end
+end
diff --git a/spec/lib/open_food_network/products_cache_spec.rb b/spec/lib/open_food_network/products_cache_spec.rb
new file mode 100644
index 0000000000..a395873f45
--- /dev/null
+++ b/spec/lib/open_food_network/products_cache_spec.rb
@@ -0,0 +1,418 @@
+require 'open_food_network/products_cache'
+
+module OpenFoodNetwork
+ describe ProductsCache do
+ describe "when a variant changes" do
+ let(:variant) { create(:variant) }
+ let(:variant_undistributed) { create(:variant) }
+ let(:supplier) { create(:supplier_enterprise) }
+ let(:coordinator) { create(:distributor_enterprise) }
+ let(:distributor) { create(:distributor_enterprise) }
+ let(:oc_undated) { create(:undated_order_cycle, distributors: [distributor], variants: [variant]) }
+ let(:oc_upcoming) { create(:upcoming_order_cycle, suppliers: [supplier], coordinator: coordinator, distributors: [distributor], variants: [variant]) }
+ let(:oc_open) { create(:open_order_cycle, distributors: [distributor], variants: [variant]) }
+ let(:oc_closed) { create(:closed_order_cycle, distributors: [distributor], variants: [variant]) }
+
+ it "refreshes distributions with upcoming order cycles" do
+ oc_upcoming
+ expect(ProductsCache).to receive(:refresh_cache).with(distributor, oc_upcoming)
+ ProductsCache.variant_changed variant
+ end
+
+ it "refreshes distributions with open order cycles" do
+ oc_open
+ expect(ProductsCache).to receive(:refresh_cache).with(distributor, oc_open)
+ ProductsCache.variant_changed variant
+ end
+
+ it "does not refresh distributions with undated order cycles" do
+ oc_undated
+ expect(ProductsCache).not_to receive(:refresh_cache).with(distributor, oc_undated)
+ ProductsCache.variant_changed variant
+ end
+
+ it "does not refresh distributions with closed order cycles" do
+ oc_closed
+ expect(ProductsCache).not_to receive(:refresh_cache).with(distributor, oc_closed)
+ ProductsCache.variant_changed variant
+ end
+
+ it "limits refresh to outgoing exchanges" do
+ oc_upcoming
+ expect(ProductsCache).not_to receive(:refresh_cache).with(coordinator, oc_upcoming)
+ ProductsCache.variant_changed variant
+ end
+
+ it "does not refresh distributions where the variant does not appear" do
+ oc_undated; oc_upcoming; oc_open; oc_closed
+ variant_undistributed
+ expect(ProductsCache).not_to receive(:refresh_cache)
+ ProductsCache.variant_changed variant_undistributed
+ end
+ end
+
+ describe "when a variant is destroyed" do
+ let(:variant) { create(:variant) }
+ let(:distributor) { create(:distributor_enterprise) }
+ let!(:oc) { create(:open_order_cycle, distributors: [distributor], variants: [variant]) }
+
+ it "refreshes the cache based on exchanges the variant was in before destruction" do
+ expect(ProductsCache).to receive(:refresh_cache).with(distributor, oc)
+ variant.destroy
+ end
+
+ it "performs the cache refresh after the variant has been destroyed" do
+ expect(ProductsCache).to receive(:refresh_cache).with(distributor, oc) do
+ expect(Spree::Variant.where(id: variant.id)).to be_empty
+ end
+
+ variant.destroy
+ end
+ end
+
+ describe "when a product changes" do
+ let(:product) { create(:simple_product) }
+ let(:v1) { create(:variant, product: product) }
+ let(:v2) { create(:variant, product: product) }
+ let(:d1) { create(:distributor_enterprise) }
+ let(:d2) { create(:distributor_enterprise) }
+ let(:oc) { create(:open_order_cycle) }
+ let!(:ex1) { create(:exchange, order_cycle: oc, sender: oc.coordinator, receiver: d1, variants: [v1]) }
+ let!(:ex2) { create(:exchange, order_cycle: oc, sender: oc.coordinator, receiver: d2, variants: [v1, v2]) }
+
+ before { product.reload }
+
+ it "refreshes the distribution each variant appears in, once each" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).once
+ expect(ProductsCache).to receive(:refresh_cache).with(d2, oc).once
+ ProductsCache.product_changed product
+ end
+ end
+
+ describe "when a variant override changes" do
+ let(:variant) { create(:variant) }
+ let(:d1) { create(:distributor_enterprise) }
+ let(:d2) { create(:distributor_enterprise) }
+ let!(:vo) { create(:variant_override, variant: variant, hub: d1) }
+ let!(:oc) { create(:open_order_cycle, distributors: [d1, d2], variants: [variant]) }
+
+ it "refreshes the distributions that the variant override affects" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).once
+ ProductsCache.variant_override_changed vo
+ end
+
+ it "does not refresh other distributors of the variant" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d2, oc).never
+ ProductsCache.variant_override_changed vo
+ end
+ end
+
+
+ describe "when a variant override is destroyed" do
+ let(:vo) { double(:variant_override) }
+
+ it "performs the same refresh as a variant override change" do
+ expect(ProductsCache).to receive(:variant_override_changed).with(vo)
+ ProductsCache.variant_override_destroyed vo
+ end
+ end
+
+
+ describe "when a producer property is changed" do
+ let(:s) { create(:supplier_enterprise) }
+ let(:pp) { s.producer_properties.last }
+ let(:product) { create(:simple_product, supplier: s) }
+ let(:v1) { create(:variant, product: product) }
+ let(:v2) { create(:variant, product: product) }
+ let(:v_deleted) { create(:variant, product: product, deleted_at: Time.now) }
+ let(:d1) { create(:distributor_enterprise) }
+ let(:d2) { create(:distributor_enterprise) }
+ let(:d3) { create(:distributor_enterprise) }
+ let(:oc) { create(:open_order_cycle) }
+ let!(:ex1) { create(:exchange, order_cycle: oc, sender: oc.coordinator, receiver: d1, variants: [v1]) }
+ let!(:ex2) { create(:exchange, order_cycle: oc, sender: oc.coordinator, receiver: d2, variants: [v1, v2]) }
+ let!(:ex3) { create(:exchange, order_cycle: oc, sender: oc.coordinator, receiver: d3, variants: [product.master, v_deleted]) }
+
+ before do
+ s.set_producer_property :organic, 'NASAA 12345'
+ end
+
+ it "refreshes the distributions the supplied variants appear in" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).once
+ expect(ProductsCache).to receive(:refresh_cache).with(d2, oc).once
+ ProductsCache.producer_property_changed pp
+ end
+
+ it "doesn't respond to master or deleted variants" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d3, oc).never
+ ProductsCache.producer_property_changed pp
+ end
+ end
+
+
+ describe "when a producer property is destroyed" do
+ let(:producer_property) { double(:producer_property) }
+
+ it "triggers the same update as a change to the producer property" do
+ expect(ProductsCache).to receive(:producer_property_changed).with(producer_property)
+ ProductsCache.producer_property_destroyed producer_property
+ end
+ end
+
+
+ describe "when an order cycle is changed" do
+ let(:variant) { create(:variant) }
+ let(:s) { create(:supplier_enterprise) }
+ let(:c) { create(:distributor_enterprise) }
+ let(:d1) { create(:distributor_enterprise) }
+ let(:d2) { create(:distributor_enterprise) }
+ let!(:oc_open) { create(:open_order_cycle, suppliers: [s], coordinator: c, distributors: [d1, d2], variants: [variant]) }
+ let!(:oc_upcoming) { create(:upcoming_order_cycle, suppliers: [s], coordinator: c, distributors: [d1, d2], variants: [variant]) }
+
+ before do
+ oc_open.reload
+ oc_upcoming.reload
+ end
+
+ it "updates each outgoing distribution in an upcoming order cycle" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc_upcoming).once
+ expect(ProductsCache).to receive(:refresh_cache).with(d2, oc_upcoming).once
+ ProductsCache.order_cycle_changed oc_upcoming
+ end
+
+ it "updates each outgoing distribution in an open order cycle" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc_open).once
+ expect(ProductsCache).to receive(:refresh_cache).with(d2, oc_open).once
+ ProductsCache.order_cycle_changed oc_open
+ end
+
+ it "does nothing when the order cycle has been made undated" do
+ expect(ProductsCache).to receive(:refresh_cache).never
+ oc_open.orders_open_at = oc_open.orders_close_at = nil
+ oc_open.save!
+ end
+
+ it "does nothing when the order cycle has been closed" do
+ expect(ProductsCache).to receive(:refresh_cache).never
+ oc_open.orders_open_at = 2.weeks.ago
+ oc_open.orders_close_at = 1.week.ago
+ oc_open.save!
+ end
+
+ it "does not update incoming exchanges" do
+ expect(ProductsCache).to receive(:refresh_cache).with(c, oc_open).never
+ ProductsCache.order_cycle_changed oc_open
+ end
+ end
+
+
+ describe "when an exchange is changed" do
+ let(:s) { create(:supplier_enterprise) }
+ let(:c) { create(:distributor_enterprise) }
+ let(:d1) { create(:distributor_enterprise) }
+ let(:d2) { create(:distributor_enterprise) }
+ let(:v) { create(:variant) }
+ let(:oc) { create(:open_order_cycle, coordinator: c) }
+
+ describe "incoming exchanges" do
+ let!(:ex1) { create(:exchange, order_cycle: oc, sender: s, receiver: c, incoming: true, variants: [v]) }
+ let!(:ex2) { create(:exchange, order_cycle: oc, sender: c, receiver: d1, incoming: false, variants: [v]) }
+ let!(:ex3) { create(:exchange, order_cycle: oc, sender: c, receiver: d2, incoming: false, variants: []) }
+
+ before { oc.reload }
+
+ it "updates distributions that include one of the supplier's variants" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).once
+ ProductsCache.exchange_changed ex1
+ end
+
+ it "doesn't update distributions that don't include any of the supplier's variants" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d2, oc).never
+ ProductsCache.exchange_changed ex1
+ end
+ end
+
+ describe "outgoing exchanges" do
+ let!(:ex) { create(:exchange, order_cycle: oc, sender: c, receiver: d1, incoming: false) }
+
+ it "does not update for undated order cycles" do
+ oc.update_attributes! orders_open_at: nil, orders_close_at: nil
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).never
+ ProductsCache.exchange_changed ex
+ end
+
+ it "updates for upcoming order cycles" do
+ oc.update_attributes! orders_open_at: 1.week.from_now, orders_close_at: 2.weeks.from_now
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).once
+ ProductsCache.exchange_changed ex
+ end
+
+ it "updates for open order cycles" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).once
+ ProductsCache.exchange_changed ex
+ end
+
+ it "does not update for closed order cycles" do
+ oc.update_attributes! orders_open_at: 2.weeks.ago, orders_close_at: 1.week.ago
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).never
+ ProductsCache.exchange_changed ex
+ end
+ end
+ end
+
+
+ describe "when an exchange is destroyed" do
+ let(:exchange) { double(:exchange) }
+
+ it "triggers the same update as a change to the exchange" do
+ expect(ProductsCache).to receive(:exchange_changed).with(exchange)
+ ProductsCache.exchange_destroyed exchange
+ end
+ end
+
+
+ describe "when an enterprise fee is changed" do
+ let(:s) { create(:supplier_enterprise) }
+ let(:c) { create(:distributor_enterprise) }
+ let(:d1) { create(:distributor_enterprise) }
+ let(:d2) { create(:distributor_enterprise) }
+ let(:ef) { create(:enterprise_fee) }
+ let(:ef_coord) { create(:enterprise_fee, order_cycles: [oc]) }
+ let(:oc) { create(:open_order_cycle, coordinator: c) }
+
+
+ describe "updating exchanges when it's a supplier fee" do
+ let(:v) { create(:variant) }
+ let!(:ex1) { create(:exchange, order_cycle: oc, sender: s, receiver: c, incoming: true, variants: [v], enterprise_fees: [ef]) }
+ let!(:ex2) { create(:exchange, order_cycle: oc, sender: c, receiver: d1, incoming: false, variants: [v]) }
+ let!(:ex3) { create(:exchange, order_cycle: oc, sender: c, receiver: d2, incoming: false, variants: []) }
+
+ before { ef.reload }
+
+ describe "updating distributions that include one of the supplier's variants" do
+ it "does not update undated order cycles" do
+ oc.update_attributes! orders_open_at: nil, orders_close_at: nil
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).never
+ ProductsCache.enterprise_fee_changed ef
+ end
+
+ it "updates upcoming order cycles" do
+ oc.update_attributes! orders_open_at: 1.week.from_now, orders_close_at: 2.weeks.from_now
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).once
+ ProductsCache.enterprise_fee_changed ef
+ end
+
+ it "updates open order cycles" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).once
+ ProductsCache.enterprise_fee_changed ef
+ end
+
+ it "does not update closed order cycles" do
+ oc.update_attributes! orders_open_at: 2.weeks.ago, orders_close_at: 1.week.ago
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).never
+ ProductsCache.enterprise_fee_changed ef
+ end
+ end
+
+ it "doesn't update distributions that don't include any of the supplier's variants" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d2, oc).never
+ ProductsCache.enterprise_fee_changed ef
+ end
+ end
+
+
+ it "updates order cycles when it's a coordinator fee" do
+ ef_coord
+ expect(ProductsCache).to receive(:order_cycle_changed).with(oc).once
+ ProductsCache.enterprise_fee_changed ef_coord
+ end
+
+
+ describe "updating exchanges when it's a distributor fee" do
+ let(:ex0) { create(:exchange, order_cycle: oc, sender: s, receiver: c, incoming: true, enterprise_fees: [ef]) }
+ let(:ex1) { create(:exchange, order_cycle: oc, sender: c, receiver: d1, incoming: false, enterprise_fees: [ef]) }
+ let(:ex2) { create(:exchange, order_cycle: oc, sender: c, receiver: d2, incoming: false, enterprise_fees: []) }
+
+ describe "updating distributions that include the fee" do
+ it "does not update undated order cycles" do
+ oc.update_attributes! orders_open_at: nil, orders_close_at: nil
+ ex1
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).never
+ ProductsCache.enterprise_fee_changed ef
+ end
+
+ it "updates upcoming order cycles" do
+ oc.update_attributes! orders_open_at: 1.week.from_now, orders_close_at: 2.weeks.from_now
+ ex1
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).once
+ ProductsCache.enterprise_fee_changed ef
+ end
+
+ it "updates open order cycles" do
+ ex1
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).once
+ ProductsCache.enterprise_fee_changed ef
+ end
+
+ it "does not update closed order cycles" do
+ oc.update_attributes! orders_open_at: 2.weeks.ago, orders_close_at: 1.week.ago
+ ex1
+ expect(ProductsCache).to receive(:refresh_cache).with(d1, oc).never
+ ProductsCache.enterprise_fee_changed ef
+ end
+ end
+
+ it "doesn't update exchanges that don't include the fee" do
+ ex1; ex2
+ expect(ProductsCache).to receive(:refresh_cache).with(d2, oc).never
+ ProductsCache.enterprise_fee_changed ef
+ end
+
+ it "doesn't update incoming exchanges" do
+ ex0
+ expect(ProductsCache).to receive(:refresh_cache).with(c, oc).never
+ ProductsCache.enterprise_fee_changed ef
+ end
+ end
+ end
+
+ describe "when a distributor enterprise is changed" do
+ let(:d) { create(:distributor_enterprise) }
+ let(:oc) { create(:open_order_cycle, distributors: [d]) }
+
+ it "updates each distribution the enterprise is active in" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d, oc)
+ ProductsCache.distributor_changed d
+ end
+ end
+
+ describe "when an inventory item is changed" do
+ let!(:d) { create(:distributor_enterprise) }
+ let!(:v) { create(:variant) }
+ let!(:oc1) { create(:open_order_cycle, distributors: [d], variants: [v]) }
+ let(:oc2) { create(:open_order_cycle, distributors: [d], variants: []) }
+ let!(:ii) { create(:inventory_item, enterprise: d, variant: v) }
+
+ it "updates each distribution for that enterprise+variant" do
+ expect(ProductsCache).to receive(:refresh_cache).with(d, oc1)
+ ProductsCache.inventory_item_changed ii
+ end
+
+ it "doesn't update distributions that don't feature the variant" do
+ oc2
+ expect(ProductsCache).to receive(:refresh_cache).with(d, oc2).never
+ ProductsCache.inventory_item_changed ii
+ end
+ end
+
+ describe "refreshing the cache" do
+ let(:distributor) { double(:distributor) }
+ let(:order_cycle) { double(:order_cycle) }
+
+ it "notifies ProductsCacheRefreshment" do
+ expect(ProductsCacheRefreshment).to receive(:refresh).with(distributor, order_cycle)
+ ProductsCache.send(:refresh_cache, distributor, order_cycle)
+ end
+ end
+ end
+end
diff --git a/spec/lib/open_food_network/products_renderer_spec.rb b/spec/lib/open_food_network/products_renderer_spec.rb
index a231fd3688..1069c9946c 100644
--- a/spec/lib/open_food_network/products_renderer_spec.rb
+++ b/spec/lib/open_food_network/products_renderer_spec.rb
@@ -3,10 +3,10 @@ require 'open_food_network/products_renderer'
module OpenFoodNetwork
describe ProductsRenderer do
- let(:d) { create(:distributor_enterprise) }
- let(:order_cycle) { create(:simple_order_cycle, distributors: [d], coordinator: create(:distributor_enterprise)) }
- let(:exchange) { Exchange.find(order_cycle.exchanges.to_enterprises(d).outgoing.first.id) }
- let(:pr) { ProductsRenderer.new(d, order_cycle) }
+ let(:distributor) { create(:distributor_enterprise) }
+ let(:order_cycle) { create(:simple_order_cycle, distributors: [distributor]) }
+ let(:exchange) { order_cycle.exchanges.to_enterprises(distributor).outgoing.first }
+ let(:pr) { ProductsRenderer.new(distributor, order_cycle) }
describe "sorting" do
let(:t1) { create(:taxon) }
@@ -24,14 +24,14 @@ module OpenFoodNetwork
end
it "sorts products by the distributor's preferred taxon list" do
- d.stub(:preferred_shopfront_taxon_order) {"#{t1.id},#{t2.id}"}
- products = pr.send(:products_for_shop)
+ distributor.stub(:preferred_shopfront_taxon_order) {"#{t1.id},#{t2.id}"}
+ products = pr.send(:load_products)
products.should == [p2, p4, p1, p3]
end
it "alphabetizes products by name when taxon list is not set" do
- d.stub(:preferred_shopfront_taxon_order) {""}
- products = pr.send(:products_for_shop)
+ distributor.stub(:preferred_shopfront_taxon_order) {""}
+ products = pr.send(:load_products)
products.should == [p1, p2, p3, p4]
end
end
@@ -45,17 +45,17 @@ module OpenFoodNetwork
end
it "only returns products for the current order cycle" do
- pr.products.should include product.name
+ pr.products_json.should include product.name
end
it "doesn't return products not in stock" do
variant.update_attribute(:count_on_hand, 0)
- pr.products.should_not include product.name
+ pr.products_json.should_not include product.name
end
it "strips html from description" do
product.update_attribute(:description, "turtles frogs")
- json = pr.products
+ json = pr.products_json
json.should include "frogs"
json.should_not include " ["48x48>", :png]}
end
end
+
+ describe "callbacks" do
+ let!(:product) { create(:simple_product) }
+
+ let!(:image_file) { File.open("#{Rails.root}/app/assets/images/logo-white.png") }
+ let!(:image) { Image.create(viewable_id: product.master.id, viewable_type: 'Spree::Variant', alt: "image", attachment: image_file) }
+
+ it "refreshes the products cache when changed" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:product_changed).with(product)
+ image.alt = 'asdf'
+ image.save
+ end
+
+ it "refreshes the products cache when destroyed" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:product_changed).with(product)
+ image.destroy
+ end
+ end
end
end
diff --git a/spec/models/spree/option_type_spec.rb b/spec/models/spree/option_type_spec.rb
new file mode 100644
index 0000000000..cfc0654733
--- /dev/null
+++ b/spec/models/spree/option_type_spec.rb
@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+module Spree
+ describe OptionType do
+ describe "products cache" do
+ let!(:product) { create(:simple_product, option_types: [option_type]) }
+ let(:variant) { product.variants.first }
+ let(:option_type) { create(:option_type) }
+ let(:option_value) { create(:option_value, option_type: option_type) }
+
+ before do
+ option_type.reload
+ variant.option_values << option_value
+ end
+
+ it "refreshes the products cache on change, via product" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:product_changed).with(product)
+ option_type.name = 'foo'
+ option_type.save!
+ end
+
+ it "refreshes the products cache on destruction, via option value destruction" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:variant_changed).with(variant)
+ option_type.destroy
+ end
+ end
+ end
+end
diff --git a/spec/models/spree/option_value_spec.rb b/spec/models/spree/option_value_spec.rb
new file mode 100644
index 0000000000..f784e08af2
--- /dev/null
+++ b/spec/models/spree/option_value_spec.rb
@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+module Spree
+ describe OptionValue do
+ describe "products cache" do
+ let(:variant) { create(:variant) }
+ let(:option_value) { create(:option_value) }
+
+ before do
+ variant.option_values << option_value
+ option_value.reload
+ end
+
+ it "refreshes the products cache on change, via variant" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:variant_changed).with(variant)
+ option_value.name = 'foo'
+ option_value.save!
+ end
+
+ it "refreshes the products cache on destruction, via variant" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:variant_changed).with(variant)
+ option_value.destroy
+ end
+ end
+ end
+end
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index 4d681e01cc..ab86be1580 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -108,44 +108,76 @@ describe Spree::Order do
subject.update_distribution_charge!
end
- describe "looking up whether a line item can be provided by an order cycle" do
- it "returns true when the variant is provided" do
- v = double(:variant)
- line_item = double(:line_item, variant: v)
- order_cycle = double(:order_cycle, variants: [v])
- subject.stub(:order_cycle) { order_cycle }
+ context "appying tag rules" do
+ let(:enterprise) { create(:distributor_enterprise) }
+ let(:customer) { create(:customer, enterprise: enterprise, tag_list: "tagtagtag") }
+ let(:tag_rule) { create(:tag_rule, enterprise: enterprise, preferred_customer_tags: "tagtagtag") }
+ let(:order) { create(:order_with_totals_and_distribution, distributor: enterprise, customer: customer) }
- subject.send(:provided_by_order_cycle?, line_item).should be_true
+ before do
+ tag_rule.calculator.update_attribute(:preferred_flat_percent, -10)
end
- it "returns false otherwise" do
- v = double(:variant)
- line_item = double(:line_item, variant: v)
- order_cycle = double(:order_cycle, variants: [])
- subject.stub(:order_cycle) { order_cycle }
-
- subject.send(:provided_by_order_cycle?, line_item).should be_false
+ context "when the rule applies" do
+ it "applies the rule" do
+ order.update_distribution_charge!
+ order.reload
+ discount = order.adjustments.find_by_label("Discount")
+ expect(discount).to be_a Spree::Adjustment
+ expect(discount.amount).to eq (order.item_total / -10).round(2)
+ end
end
- it "returns false when there is no order cycle" do
- v = double(:variant)
- line_item = double(:line_item, variant: v)
- subject.stub(:order_cycle) { nil }
+ context "when the rule does not apply" do
+ before { tag_rule.update_attribute(:preferred_customer_tags, "tagtag") }
- subject.send(:provided_by_order_cycle?, line_item).should be_false
+ it "does not apply the rule" do
+ order.update_distribution_charge!
+ order.reload
+ discount = order.adjustments.find_by_label("Discount")
+ expect(discount).to be_nil
+ end
end
end
+ end
- it "looks up product distribution enterprise fees for a line item" do
- product = double(:product)
- variant = double(:variant, product: product)
- line_item = double(:line_item, variant: variant)
+ describe "looking up whether a line item can be provided by an order cycle" do
+ it "returns true when the variant is provided" do
+ v = double(:variant)
+ line_item = double(:line_item, variant: v)
+ order_cycle = double(:order_cycle, variants: [v])
+ subject.stub(:order_cycle) { order_cycle }
- product_distribution = double(:product_distribution)
- product.should_receive(:product_distribution_for).with(subject.distributor) { product_distribution }
-
- subject.send(:product_distribution_for, line_item).should == product_distribution
+ subject.send(:provided_by_order_cycle?, line_item).should be_true
end
+
+ it "returns false otherwise" do
+ v = double(:variant)
+ line_item = double(:line_item, variant: v)
+ order_cycle = double(:order_cycle, variants: [])
+ subject.stub(:order_cycle) { order_cycle }
+
+ subject.send(:provided_by_order_cycle?, line_item).should be_false
+ end
+
+ it "returns false when there is no order cycle" do
+ v = double(:variant)
+ line_item = double(:line_item, variant: v)
+ subject.stub(:order_cycle) { nil }
+
+ subject.send(:provided_by_order_cycle?, line_item).should be_false
+ end
+ end
+
+ it "looks up product distribution enterprise fees for a line item" do
+ product = double(:product)
+ variant = double(:variant, product: product)
+ line_item = double(:line_item, variant: variant)
+
+ product_distribution = double(:product_distribution)
+ product.should_receive(:product_distribution_for).with(subject.distributor) { product_distribution }
+
+ subject.send(:product_distribution_for, line_item).should == product_distribution
end
describe "getting the admin and handling charge" do
@@ -457,33 +489,6 @@ describe Spree::Order do
Spree::Order.not_state(:canceled).should_not include o
end
end
-
- describe "with payment method names" do
- let!(:o1) { create(:order) }
- let!(:o2) { create(:order) }
- let!(:pm1) { create(:payment_method, name: 'foo') }
- let!(:pm2) { create(:payment_method, name: 'bar') }
- let!(:p1) { create(:payment, order: o1, payment_method: pm1) }
- let!(:p2) { create(:payment, order: o2, payment_method: pm2) }
-
- it "returns the order with payment method name when one specified" do
- Spree::Order.with_payment_method_name('foo').should == [o1]
- end
-
- it "returns the orders with payment method name when many specified" do
- Spree::Order.with_payment_method_name(['foo', 'bar']).should include o1, o2
- end
-
- it "doesn't return rows with a different payment method name" do
- Spree::Order.with_payment_method_name('foobar').should_not include o1
- Spree::Order.with_payment_method_name('foobar').should_not include o2
- end
-
- it "doesn't return duplicate rows" do
- p2 = FactoryGirl.create(:payment, order: o1, payment_method: pm1)
- Spree::Order.with_payment_method_name('foo').length.should == 1
- end
- end
end
describe "shipping address prepopulation" do
@@ -559,39 +564,76 @@ describe Spree::Order do
end
describe "associating a customer" do
- let(:user) { create(:user) }
let(:distributor) { create(:distributor_enterprise) }
+ let!(:order) { create(:order, distributor: distributor) }
- context "when a user has been set on the order" do
- let!(:order) { create(:order, distributor: distributor, user: user) }
- context "and a customer for order.distributor and order.user.email already exists" do
- let!(:customer) { create(:customer, enterprise: distributor, email: user.email) }
- it "associates the order with the existing customer" do
- order.send(:associate_customer)
+ context "when an email address is available for the order" do
+ before { allow(order).to receive(:email_for_customer) { "existing@email.com" }}
+
+ context "and a customer for order.distributor and order#email_for_customer already exists" do
+ let!(:customer) { create(:customer, enterprise: distributor, email: "existing@email.com" ) }
+
+ it "associates the order with the existing customer, and returns the customer" do
+ result = order.send(:associate_customer)
expect(order.customer).to eq customer
+ expect(result).to eq customer
end
end
+
context "and a customer for order.distributor and order.user.email does not alread exist" do
let!(:customer) { create(:customer, enterprise: distributor, email: 'some-other-email@email.com') }
- it "creates a new customer" do
- expect{order.send(:associate_customer)}.to change{Customer.count}.by 1
+
+ it "does not set the customer and returns nil" do
+ result = order.send(:associate_customer)
+ expect(order.customer).to be_nil
+ expect(result).to be_nil
end
end
end
- context "when a user has not been set on the order" do
- let!(:order) { create(:order, distributor: distributor, user: nil) }
- context "and a customer for order.distributor and order.email already exists" do
- let!(:customer) { create(:customer, enterprise: distributor, email: order.email) }
- it "creates a new customer" do
- order.send(:associate_customer)
+ context "when an email address is not available for the order" do
+ let!(:customer) { create(:customer, enterprise: distributor) }
+ before { allow(order).to receive(:email_for_customer) { nil }}
+
+ it "does not set the customer and returns nil" do
+ result = order.send(:associate_customer)
+ expect(order.customer).to be_nil
+ expect(result).to be_nil
+ end
+ end
+ end
+
+ describe "ensuring a customer is linked" do
+ let(:distributor) { create(:distributor_enterprise) }
+ let!(:order) { create(:order, distributor: distributor) }
+
+ context "when a customer has already been linked to the order" do
+ let!(:customer) { create(:customer, enterprise: distributor, email: "existing@email.com" ) }
+ before { order.update_attribute(:customer_id, customer.id) }
+
+ it "does nothing" do
+ order.send(:ensure_customer)
+ expect(order.customer).to eq customer
+ end
+ end
+
+ context "when a customer not been linked to the order" do
+ context "but one matching order#email_for_customer already exists" do
+ let!(:customer) { create(:customer, enterprise: distributor, email: 'some-other-email@email.com') }
+ before { allow(order).to receive(:email_for_customer) { 'some-other-email@email.com' } }
+
+ it "links the customer customer to the order" do
+ expect(order.customer).to be_nil
+ expect{order.send(:ensure_customer)}.to_not change{Customer.count}
expect(order.customer).to eq customer
end
end
- context "and a customer for order.distributor and order.email does not alread exist" do
- let!(:customer) { create(:customer, enterprise: distributor, email: 'some-other-email@email.com') }
+
+ context "and order#email_for_customer does not match any existing customers" do
it "creates a new customer" do
- expect{order.send(:associate_customer)}.to change{Customer.count}.by 1
+ expect(order.customer).to be_nil
+ expect{order.send(:ensure_customer)}.to change{Customer.count}.by 1
+ expect(order.customer).to be_a Customer
end
end
end
diff --git a/spec/models/spree/preference_spec.rb b/spec/models/spree/preference_spec.rb
new file mode 100644
index 0000000000..ff71c9c9c6
--- /dev/null
+++ b/spec/models/spree/preference_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module Spree
+ describe Preference do
+ describe "refreshing the products cache" do
+ it "reports when product_selection_from_inventory_only has changed" do
+ p = Preference.new(key: 'enterprise/product_selection_from_inventory_only/123')
+ expect(p.send(:product_selection_from_inventory_only_changed?)).to be_true
+ end
+
+ it "reports when product_selection_from_inventory_only has not changed" do
+ p = Preference.new(key: 'enterprise/shopfront_message/123')
+ expect(p.send(:product_selection_from_inventory_only_changed?)).to be_false
+ end
+
+ it "looks up the referenced enterprise" do
+ e = create(:distributor_enterprise)
+ p = Preference.new(key: "enterprise/product_selection_from_inventory_only/#{e.id}")
+ expect(p.send(:enterprise)).to eql e
+ end
+ end
+ end
+end
diff --git a/spec/models/spree/price_spec.rb b/spec/models/spree/price_spec.rb
new file mode 100644
index 0000000000..5d48afd95b
--- /dev/null
+++ b/spec/models/spree/price_spec.rb
@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+module Spree
+ describe Price do
+ describe "callbacks" do
+ let(:variant) { create(:variant) }
+ let(:price) { variant.default_price }
+
+ it "refreshes the products cache on change" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:variant_changed).with(variant)
+ price.amount = 123
+ price.save
+ end
+
+ # Do not refresh on price destruction - this (only?) happens when variant is destroyed,
+ # and in that case the variant will take responsibility for refreshing the cache
+
+ it "does not refresh the cache when variant is not set" do
+ # Creates a price without the back link to variant
+ create(:product, master: create(:variant))
+ expect(OpenFoodNetwork::ProductsCache).to receive(:variant_changed).never
+ end
+ end
+ end
+end
diff --git a/spec/models/spree/product_property_spec.rb b/spec/models/spree/product_property_spec.rb
new file mode 100644
index 0000000000..1c9799ab29
--- /dev/null
+++ b/spec/models/spree/product_property_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+module Spree
+ describe ProductProperty do
+ describe "callbacks" do
+ let(:product) { product_property.product }
+ let(:product_property) { create(:product_property) }
+
+ it "refreshes the products cache on save, via Product" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:product_changed).with(product)
+ product_property.value = 123
+ product_property.save
+ end
+
+ it "refreshes the products cache on destroy" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:product_changed).with(product)
+ product_property.destroy
+ end
+ end
+ end
+end
diff --git a/spec/models/spree/product_spec.rb b/spec/models/spree/product_spec.rb
index c37b49bc23..9c2ee6b664 100644
--- a/spec/models/spree/product_spec.rb
+++ b/spec/models/spree/product_spec.rb
@@ -161,6 +161,19 @@ module Spree
end
end
+ describe "callbacks" do
+ let(:product) { create(:simple_product) }
+
+ it "refreshes the products cache on save" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:product_changed).with(product)
+ product.name = 'asdf'
+ product.save
+ end
+
+ # On destroy, all distributed variants are refreshed by a Variant around_destroy
+ # callback, so we don't need to do anything on the product model.
+ end
+
describe "scopes" do
describe "in_supplier" do
it "shows products in supplier" do
diff --git a/spec/models/spree/property_spec.rb b/spec/models/spree/property_spec.rb
new file mode 100644
index 0000000000..a86513b5a9
--- /dev/null
+++ b/spec/models/spree/property_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+module Spree
+ describe Property do
+ describe "callbacks" do
+ let(:property) { product_property.property }
+ let(:product) { product_property.product }
+ let(:product_property) { create(:product_property) }
+
+ it "refreshes the products cache on save" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:product_changed).with(product)
+ property.name = 'asdf'
+ property.save
+ end
+ end
+ end
+end
diff --git a/spec/models/spree/shipping_method_spec.rb b/spec/models/spree/shipping_method_spec.rb
index 0e738470dd..33c44b8b6d 100644
--- a/spec/models/spree/shipping_method_spec.rb
+++ b/spec/models/spree/shipping_method_spec.rb
@@ -37,21 +37,28 @@ module Spree
describe "availability" do
- let(:sm) { build(:shipping_method) }
+ let(:sm) { create(:shipping_method) }
+ let(:currency) { 'AUD' }
+
+ before do
+ sm.calculator.preferred_currency = currency
+ end
it "is available to orders that match its distributor" do
- o = build(:order, ship_address: build(:address), distributor: sm.distributors.first)
+ o = create(:order, ship_address: create(:address),
+ distributor: sm.distributors.first, currency: currency)
sm.should be_available_to_order o
end
it "is not available to orders that do not match its distributor" do
- o = build(:order, ship_address: build(:address),
- distributor: build(:distributor_enterprise))
+ o = create(:order, ship_address: create(:address),
+ distributor: create(:distributor_enterprise), currency: currency)
sm.should_not be_available_to_order o
end
it "is available to orders with no shipping address" do
- o = build(:order, ship_address: nil, distributor: sm.distributors.first)
+ o = create(:order, ship_address: nil,
+ distributor: sm.distributors.first, currency: currency)
sm.should be_available_to_order o
end
end
diff --git a/spec/models/spree/taxon_spec.rb b/spec/models/spree/taxon_spec.rb
index a0d729c054..926e5b3c5f 100644
--- a/spec/models/spree/taxon_spec.rb
+++ b/spec/models/spree/taxon_spec.rb
@@ -7,6 +7,21 @@ module Spree
let(:t1) { create(:taxon) }
let(:t2) { create(:taxon) }
+ describe "callbacks" do
+ let(:product) { create(:simple_product, taxons: [t1]) }
+
+ it "refreshes the products cache on save" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:product_changed).with(product)
+ t1.name = 'asdf'
+ t1.save
+ end
+
+ it "refreshes the products cache on destroy" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:product_changed).with(product)
+ t1.destroy
+ end
+ end
+
describe "finding all supplied taxons" do
let!(:p1) { create(:simple_product, supplier: e, taxons: [t1, t2]) }
diff --git a/spec/models/spree/user_spec.rb b/spec/models/spree/user_spec.rb
index 7fefd56afb..923bc93183 100644
--- a/spec/models/spree/user_spec.rb
+++ b/spec/models/spree/user_spec.rb
@@ -17,11 +17,11 @@ describe Spree.user_class do
it "enforces the limit on the number of enterprise owned" do
expect(u2.owned_enterprises(:reload)).to eq []
u2.owned_enterprises << e1
- expect(u2.save!).to_not raise_error
- expect {
+ expect { u2.save! }.to_not raise_error
+ expect do
u2.owned_enterprises << e2
u2.save!
- }.to raise_error ActiveRecord::RecordInvalid, "Validation failed: #{u2.email} is not permitted to own any more enterprises (limit is 1)."
+ end.to raise_error ActiveRecord::RecordInvalid, "Validation failed: #{u2.email} is not permitted to own any more enterprises (limit is 1)."
end
end
@@ -53,6 +53,23 @@ describe Spree.user_class do
create(:user)
end.to enqueue_job ConfirmSignupJob
end
+
+ it "should not create a customer" do
+ expect do
+ create(:user)
+ end.to change(Customer, :count).by(0)
+ end
+
+ describe "when a customer record exists" do
+ let!(:customer) { create(:customer, user: nil) }
+
+ it "should not create a customer" do
+ expect(customer.user).to be nil
+ user = create(:user, email: customer.email)
+ customer.reload
+ expect(customer.user).to eq user
+ end
+ end
end
describe "known_users" do
@@ -65,9 +82,9 @@ describe Spree.user_class do
it "returns a list of users which manage shared enterprises" do
expect(u1.known_users).to include u1, u2
expect(u1.known_users).to_not include u3
- expect(u2.known_users).to include u1,u2
+ expect(u2.known_users).to include u1, u2
expect(u2.known_users).to_not include u3
- expect(u3.known_users).to_not include u1,u2,u3
+ expect(u3.known_users).to_not include u1, u2, u3
end
end
@@ -79,4 +96,43 @@ describe Spree.user_class do
end
end
end
+
+ describe "retrieving orders for /account page" do
+ let!(:u1) { create(:user) }
+ let!(:u2) { create(:user) }
+ let!(:distributor1) { create(:distributor_enterprise) }
+ let!(:distributor2) { create(:distributor_enterprise) }
+ let!(:d1o1) { create(:completed_order_with_totals, distributor: distributor1, user_id: u1.id) }
+ let!(:d1o2) { create(:completed_order_with_totals, distributor: distributor1, user_id: u1.id) }
+ let!(:d1_order_for_u2) { create(:completed_order_with_totals, distributor: distributor1, user_id: u2.id) }
+ let!(:d1o3) { create(:order, state: 'cart', distributor: distributor1, user_id: u1.id) }
+ let!(:d2o1) { create(:completed_order_with_totals, distributor: distributor2, user_id: u2.id) }
+
+ let!(:completed_payment) { create(:payment, order: d1o1, state: 'completed') }
+ let!(:payment) { create(:payment, order: d1o2, state: 'invalid') }
+
+ it "returns enterprises that the user has ordered from" do
+ expect(u1.enterprises_ordered_from).to eq [distributor1.id]
+ end
+
+ it "returns orders and payments for the user, organised by distributor" do
+ expect(u1.orders_by_distributor).to include distributor1
+ expect(u1.orders_by_distributor.first.distributed_orders).to include d1o1
+ end
+
+ it "doesn't return irrelevant distributors" do
+ expect(u1.orders_by_distributor).not_to include distributor2
+ end
+ it "doesn't return other users' orders" do
+ expect(u1.orders_by_distributor.first.distributed_orders).not_to include d1_order_for_u2
+ end
+
+ it "doesn't return uncompleted orders" do
+ expect(u1.orders_by_distributor.first.distributed_orders).not_to include d1o3
+ end
+
+ it "doesn't return uncompleted payments" do
+ expect(u1.orders_by_distributor.first.distributed_orders.map(&:payments).flatten).not_to include payment
+ end
+ end
end
diff --git a/spec/models/spree/variant_spec.rb b/spec/models/spree/variant_spec.rb
index 82eed6ba63..a6c24bd3d3 100644
--- a/spec/models/spree/variant_spec.rb
+++ b/spec/models/spree/variant_spec.rb
@@ -1,5 +1,6 @@
require 'spec_helper'
require 'open_food_network/option_value_namer'
+require 'open_food_network/products_cache'
module Spree
describe Variant do
@@ -163,6 +164,40 @@ module Spree
end
end
+ describe "callbacks" do
+ let(:variant) { create(:variant) }
+
+ it "refreshes the products cache on save" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:variant_changed).with(variant)
+ variant.sku = 'abc123'
+ variant.save
+ end
+
+ it "refreshes the products cache on destroy" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:variant_destroyed).with(variant)
+ variant.destroy
+ end
+
+ context "when it is the master variant" do
+ let(:product) { create(:simple_product) }
+ let(:master) { product.master }
+
+ it "refreshes the products cache for the entire product on save" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:product_changed).with(product)
+ expect(OpenFoodNetwork::ProductsCache).to receive(:variant_changed).never
+ master.sku = 'abc123'
+ master.save
+ end
+
+ it "refreshes the products cache for the entire product on destroy" do
+ # Does this ever happen?
+ expect(OpenFoodNetwork::ProductsCache).to receive(:product_changed).with(product)
+ expect(OpenFoodNetwork::ProductsCache).to receive(:variant_destroyed).never
+ master.destroy
+ end
+ end
+ end
+
describe "indexing variants by id" do
let!(:v1) { create(:variant) }
let!(:v2) { create(:variant) }
diff --git a/spec/models/tag_rule/discount_order_spec.rb b/spec/models/tag_rule/discount_order_spec.rb
new file mode 100644
index 0000000000..dab901dfbf
--- /dev/null
+++ b/spec/models/tag_rule/discount_order_spec.rb
@@ -0,0 +1,93 @@
+require 'spec_helper'
+
+describe TagRule::DiscountOrder, type: :model do
+ let!(:tag_rule) { create(:tag_rule) }
+
+ describe "determining relevance based on additional requirements" do
+ let(:subject) { double(:subject) }
+
+ before do
+ tag_rule.set_context(subject,{})
+ allow(tag_rule).to receive(:customer_tags_match?) { true }
+ allow(subject).to receive(:class) { Spree::Order }
+ end
+
+ context "when already_applied? returns false" do
+ before { expect(tag_rule).to receive(:already_applied?) { false } }
+
+ it "returns true" do
+ expect(tag_rule.send(:relevant?)).to be true
+ end
+ end
+
+ context "when already_applied? returns true" do
+ before { expect(tag_rule).to receive(:already_applied?) { true } }
+
+ it "returns false immediately" do
+ expect(tag_rule.send(:relevant?)).to be false
+ end
+ end
+ end
+
+ describe "determining whether a the rule has already been applied to an order" do
+ let!(:order) { create(:order) }
+ let!(:adjustment) { order.adjustments.create({:amount => 12.34, :source => order, :originator => tag_rule, :label => 'discount' }, :without_protection => true) }
+
+ before do
+ tag_rule.set_context(order, nil)
+ end
+
+ context "where adjustments originating from the rule already exist" do
+ it { expect(tag_rule.send(:already_applied?)).to be true}
+ end
+
+ context "where existing adjustments originate from other rules" do
+ before { adjustment.update_attribute(:originator_id,create(:tag_rule).id) }
+ it { expect(tag_rule.send(:already_applied?)).to be false}
+ end
+ end
+
+ describe "applying the rule" do
+ # Assume that all validation is done by the TagRule base class
+
+ let!(:line_item) { create(:line_item, price: 100.00) }
+ let!(:order) { line_item.order }
+
+ before do
+ order.update_distribution_charge!
+ tag_rule.calculator.update_attribute(:preferred_flat_percent, -10.00)
+ tag_rule.set_context(order, nil)
+ end
+
+ context "in a simple scenario" do
+ let(:adjustment) { order.reload.adjustments.where(originator_id: tag_rule, originator_type: "TagRule").first }
+
+ it "creates a new adjustment on the order" do
+ tag_rule.send(:apply!)
+ expect(adjustment).to be_a Spree::Adjustment
+ expect(adjustment.amount).to eq -10.00
+ expect(adjustment.label).to eq "Discount"
+ expect(order.adjustment_total).to eq -10.00
+ expect(order.total).to eq 90.00
+ end
+ end
+
+ context "when shipping charges apply" do
+ let!(:shipping_method) { create(:shipping_method, calculator: Spree::Calculator::FlatRate.new( preferred_amount: 25.00 ) ) }
+ before do
+ shipping_method.create_adjustment("Shipping", order, order, true)
+ end
+
+ let(:adjustment) { order.reload.adjustments.where(originator_id: tag_rule, originator_type: "TagRule").first }
+
+ it "the adjustment is made on line item total, ie. ignores the shipping amount" do
+ tag_rule.send(:apply!)
+ expect(adjustment).to be_a Spree::Adjustment
+ expect(adjustment.amount).to eq -10.00
+ expect(adjustment.label).to eq "Discount"
+ expect(order.adjustment_total).to eq 15.00
+ expect(order.total).to eq 115.00
+ end
+ end
+ end
+end
diff --git a/spec/models/tag_rule/filter_shipping_methods_spec.rb b/spec/models/tag_rule/filter_shipping_methods_spec.rb
new file mode 100644
index 0000000000..539aa3c6ca
--- /dev/null
+++ b/spec/models/tag_rule/filter_shipping_methods_spec.rb
@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+describe TagRule::DiscountOrder, type: :model do
+ let!(:tag_rule) { create(:filter_shipping_methods_tag_rule) }
+
+ describe "determining whether tags match for a given shipping method" do
+ context "when the shipping method is nil" do
+
+ it "returns false" do
+ expect(tag_rule.send(:tags_match?, nil)).to be false
+ end
+ end
+
+ context "when the shipping method is not nil" do
+ let(:shipping_method) { create(:shipping_method, tag_list: ["member","local","volunteer"]) }
+
+ context "when the rule has no preferred shipping method tags specified" do
+ before { allow(tag_rule).to receive(:preferred_shipping_method_tags) { "" } }
+ it { expect(tag_rule.send(:tags_match?, shipping_method)).to be false }
+ end
+
+ context "when the rule has preferred customer tags specified that match ANY of the customer tags" do
+ before { allow(tag_rule).to receive(:preferred_shipping_method_tags) { "wholesale,some_tag,member" } }
+ it { expect(tag_rule.send(:tags_match?, shipping_method)).to be true }
+ end
+
+ context "when the rule has preferred customer tags specified that match NONE of the customer tags" do
+ before { allow(tag_rule).to receive(:preferred_shipping_method_tags) { "wholesale,some_tag,some_other_tag" } }
+ it { expect(tag_rule.send(:tags_match?, shipping_method)).to be false }
+ end
+ end
+ end
+
+ describe "applying the rule" do
+ # Assume that all validation is done by the TagRule base class
+
+ let(:sm1) { create(:shipping_method, tag_list: ["tag1", "something", "somethingelse"]) }
+ let(:sm2) { create(:shipping_method, tag_list: ["tag2"]) }
+ let(:sm3) { create(:shipping_method, tag_list: ["tag3"]) }
+ let!(:shipping_methods) { [sm1, sm2, sm3] }
+
+ before do
+ tag_rule.update_attribute(:preferred_shipping_method_tags, "tag2")
+ tag_rule.set_context(shipping_methods, nil)
+ end
+
+ context "apply!" do
+ context "when showing matching shipping methods" do
+ before { tag_rule.update_attribute(:preferred_matched_shipping_methods_visibility, "visible") }
+ it "does nothing" do
+ tag_rule.send(:apply!)
+ expect(shipping_methods).to eq [sm1, sm2, sm3]
+ end
+ end
+
+ context "when hiding matching shipping methods" do
+ before { tag_rule.update_attribute(:preferred_matched_shipping_methods_visibility, "hidden") }
+ it "removes matching shipping methods from the list" do
+ tag_rule.send(:apply!)
+ expect(shipping_methods).to eq [sm1, sm3]
+ end
+ end
+ end
+
+ context "apply_default!" do
+ context "when showing matching shipping methods" do
+ before { tag_rule.update_attribute(:preferred_matched_shipping_methods_visibility, "visible") }
+ it "remove matching shipping methods from the list" do
+ tag_rule.send(:apply_default!)
+ expect(shipping_methods).to eq [sm1, sm3]
+ end
+ end
+
+ context "when hiding matching shipping methods" do
+ before { tag_rule.update_attribute(:preferred_matched_shipping_methods_visibility, "hidden") }
+ it "does nothing" do
+ tag_rule.send(:apply_default!)
+ expect(shipping_methods).to eq [sm1, sm2, sm3]
+ end
+ end
+ end
+ end
+end
diff --git a/spec/models/tag_rule_spec.rb b/spec/models/tag_rule_spec.rb
new file mode 100644
index 0000000000..549c2f88aa
--- /dev/null
+++ b/spec/models/tag_rule_spec.rb
@@ -0,0 +1,201 @@
+require 'spec_helper'
+
+describe TagRule, type: :model do
+ let!(:tag_rule) { create(:tag_rule) }
+
+ describe "validations" do
+ it "requires a enterprise" do
+ expect(tag_rule).to validate_presence_of :enterprise
+ end
+ end
+
+ describe 'setting the context' do
+ let(:subject) { double(:subject) }
+ let(:context) { double(:context) }
+ it "stores the subject and context provided as instance variables on the model" do
+ tag_rule.set_context(subject, context)
+ expect(tag_rule.subject).to eq subject
+ expect(tag_rule.context).to eq context
+ expect(tag_rule.instance_variable_get(:@subject)).to eq subject
+ expect(tag_rule.instance_variable_get(:@context)).to eq context
+ end
+ end
+
+ describe "determining relevance based on subject and context" do
+ context "when the subject is nil" do
+ it "returns false" do
+ expect(tag_rule.send(:relevant?)).to be false
+ end
+ end
+
+ context "when the subject is not nil" do
+ let(:subject) { double(:subject) }
+
+ before do
+ tag_rule.set_context(subject,{})
+ allow(tag_rule).to receive(:customer_tags_match?) { :customer_tags_match_result }
+ allow(tag_rule).to receive(:subject_class) { Spree::Order}
+ end
+
+
+ context "when the subject class matches tag_rule#subject_class" do
+ before do
+ allow(subject).to receive(:class) { Spree::Order }
+ end
+
+ context "when the rule does not repond to #additional_requirements_met?" do
+ before { allow(tag_rule).to receive(:respond_to?).with(:additional_requirements_met?, true) { false } }
+
+ it "returns true" do
+ expect(tag_rule.send(:relevant?)).to be true
+ end
+ end
+
+ context "when the rule reponds to #additional_requirements_met?" do
+ before { allow(tag_rule).to receive(:respond_to?).with(:additional_requirements_met?, true) { true } }
+
+ context "and #additional_requirements_met? returns a truthy value" do
+ before { allow(tag_rule).to receive(:additional_requirements_met?) { "smeg" } }
+
+ it "returns true immediately" do
+ expect(tag_rule.send(:relevant?)).to be true
+ end
+ end
+
+ context "and #additional_requirements_met? returns true" do
+ before { allow(tag_rule).to receive(:additional_requirements_met?) { true } }
+
+ it "returns true immediately" do
+ expect(tag_rule.send(:relevant?)).to be true
+ end
+ end
+
+ context "and #additional_requirements_met? returns false" do
+ before { allow(tag_rule).to receive(:additional_requirements_met?) { false } }
+
+ it "returns false immediately" do
+ expect(tag_rule.send(:relevant?)).to be false
+ end
+ end
+ end
+ end
+
+ context "when the subject class does not match tag_rule#subject_class" do
+ before do
+ allow(subject).to receive(:class) { Spree::LineItem }
+ end
+
+ it "returns false immediately" do
+ expect(tag_rule.send(:relevant?)).to be false
+ expect(tag_rule).to_not have_received :customer_tags_match?
+ end
+ end
+ end
+
+ describe "determining whether specified customer tags match the given context" do
+ context "when the context is nil" do
+ before { tag_rule.set_context(nil, nil) }
+ it "returns false" do
+ expect(tag_rule.send(:customer_tags_match?)).to be false
+ end
+ end
+
+ context "when the context has no customer specified" do
+ let(:context) { { something_that_is_not_a_customer: double(:something) } }
+
+ before { tag_rule.set_context(nil, context) }
+
+ it "returns false" do
+ expect(tag_rule.send(:customer_tags_match?)).to be false
+ end
+ end
+
+ context "when the context has a customer specified" do
+ let(:context) { { customer: double(:customer, tag_list: ["member","local","volunteer"] ) } }
+
+ before { tag_rule.set_context(nil, context) }
+
+ context "when the rule has no preferred customer tags specified" do
+ before do
+ allow(tag_rule).to receive(:preferred_customer_tags) { "" }
+ end
+
+ it "returns false" do
+ expect(tag_rule.send(:customer_tags_match?)).to be false
+ end
+ end
+
+ context "when the rule has preferred customer tags specified that match ANY of the customer tags" do
+ before do
+ allow(tag_rule).to receive(:preferred_customer_tags) { "wholesale,some_tag,member" }
+ end
+
+ it "returns false" do
+ expect(tag_rule.send(:customer_tags_match?)).to be true
+ end
+ end
+
+ context "when the rule has preferred customer tags specified that match NONE of the customer tags" do
+ before do
+ allow(tag_rule).to receive(:preferred_customer_tags) { "wholesale,some_tag,some_other_tag" }
+ end
+
+ it "returns false" do
+ expect(tag_rule.send(:customer_tags_match?)).to be false
+ end
+ end
+ end
+ end
+
+ describe "applying a tag rule to a subject" do
+ before { allow(tag_rule).to receive(:apply!) }
+
+ context "when the rule is deemed to be relevant" do
+ before { allow(tag_rule).to receive(:relevant?) { true } }
+
+ context "and customer_tags_match? returns true" do
+ before { expect(tag_rule).to receive(:customer_tags_match?) { true } }
+
+ it "applies the rule" do
+ tag_rule.apply
+ expect(tag_rule).to have_received(:apply!)
+ end
+ end
+
+ context "when customer_tags_match? returns false" do
+ before { expect(tag_rule).to receive(:customer_tags_match?) { false } }
+ before { allow(tag_rule).to receive(:apply_default!) }
+
+ context "and the rule responds to #apply_default!" do
+ before { allow(tag_rule).to receive(:respond_to?).with(:apply_default!, true) { true } }
+
+ it "applies the default action" do
+ tag_rule.apply
+ expect(tag_rule).to_not have_received(:apply!)
+ expect(tag_rule).to have_received(:apply_default!)
+ end
+ end
+
+ context "and the rule does not respond to #apply_default!" do
+ before { allow(tag_rule).to receive(:respond_to?).with(:apply_default!, true) { false } }
+
+ it "does not apply the rule or the default action" do
+ tag_rule.apply
+ expect(tag_rule).to_not have_received(:apply!)
+ expect(tag_rule).to_not have_received(:apply_default!)
+ end
+ end
+ end
+ end
+
+ context "when the rule is deemed not to be relevant" do
+ before { allow(tag_rule).to receive(:relevant?) { false } }
+
+ it "does not apply the rule" do
+ tag_rule.apply
+ expect(tag_rule).to_not have_received(:apply!)
+ end
+ end
+ end
+ end
+end
diff --git a/spec/models/variant_override_spec.rb b/spec/models/variant_override_spec.rb
index 9efc53b521..a24a921f43 100644
--- a/spec/models/variant_override_spec.rb
+++ b/spec/models/variant_override_spec.rb
@@ -30,6 +30,22 @@ describe VariantOverride do
end
+ describe "callbacks" do
+ let!(:vo) { create(:variant_override, hub: hub, variant: variant) }
+
+ it "refreshes the products cache on save" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:variant_override_changed).with(vo)
+ vo.price = 123.45
+ vo.save
+ end
+
+ it "refreshes the products cache on destroy" do
+ expect(OpenFoodNetwork::ProductsCache).to receive(:variant_override_destroyed).with(vo)
+ vo.destroy
+ end
+ end
+
+
describe "looking up prices" do
it "returns the numeric price when present" do
VariantOverride.create!(variant: variant, hub: hub, price: 12.34)
diff --git a/spec/serializers/enterprise_serializer_spec.rb b/spec/serializers/enterprise_serializer_spec.rb
index f70852d973..f5eff4f771 100644
--- a/spec/serializers/enterprise_serializer_spec.rb
+++ b/spec/serializers/enterprise_serializer_spec.rb
@@ -1,4 +1,4 @@
-#require 'spec_helper'
+require 'spec_helper'
describe Api::EnterpriseSerializer do
let(:serializer) { Api::EnterpriseSerializer.new enterprise, data: data }
diff --git a/spec/serializers/order_serializer_spec.rb b/spec/serializers/order_serializer_spec.rb
new file mode 100644
index 0000000000..2c327537eb
--- /dev/null
+++ b/spec/serializers/order_serializer_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Api::OrderSerializer do
+ let(:serializer) { Api::OrderSerializer.new order }
+ let(:order) { create(:completed_order_with_totals) }
+
+
+ it "serializes an order" do
+ expect(serializer.to_json).to match order.number.to_s
+ end
+
+ it "convert the state attributes to translatable keys" do
+ expect(serializer.to_json).to match "complete"
+ expect(serializer.to_json).to match "balance_due"
+ end
+
+end
diff --git a/spec/serializers/orders_by_distributor_serializer_spec.rb b/spec/serializers/orders_by_distributor_serializer_spec.rb
new file mode 100644
index 0000000000..5976e9ad48
--- /dev/null
+++ b/spec/serializers/orders_by_distributor_serializer_spec.rb
@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Api::OrdersByDistributorSerializer do
+
+ # Banged lets ensure entered into test database
+ let!(:distributor1) { create(:distributor_enterprise) }
+ let!(:distributor2) { create(:distributor_enterprise) }
+ let!(:user) { create(:user)}
+ let!(:d1o1) { create(:completed_order_with_totals, distributor: distributor1, user_id: user.id, total: 10000)}
+ let!(:d1o2) { create(:completed_order_with_totals, distributor: distributor1, user_id: user.id, total: 5000)}
+ let!(:d2o1) { create(:completed_order_with_totals, distributor: distributor2, user_id: user.id)}
+
+ before do
+ @data = Enterprise.includes(:distributed_orders).where(enterprises: {id: user.enterprises_ordered_from }, spree_orders: {state: :complete, user_id: user.id}).to_a
+ @serializer = ActiveModel::ArraySerializer.new(@data, {each_serializer: Api::OrdersByDistributorSerializer})
+ end
+
+ it "serializes orders" do
+ expect(@serializer.to_json).to match "distributed_orders"
+ end
+
+ it "serializes the balance for each distributor" do
+ expect(@serializer.serializable_array[0].keys).to include :balance
+ # Would be good to test adding up balance properly but can't get a non-zero total from the factories...
+ expect(@serializer.serializable_array[0][:balance]).to eq "0.00"
+ end
+
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 80d7c2eeb7..a477ad31e1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -4,6 +4,7 @@ require 'rubygems'
require 'pry' unless ENV['CI']
require 'knapsack'
+Knapsack.tracker.config({enable_time_offset_warning: false}) unless ENV['CI']
Knapsack::Adapters::RSpecAdapter.bind
ENV["RAILS_ENV"] ||= 'test'