solidus_reviews 1.0.0 → 1.1.0

data/app/views/spree/api/reviews/index.json.jbuilder

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+json.reviews(@reviews) do |review|
+  json.partial!("spree/api/reviews/review", review: review)
+end
+json.avg_rating(@product&.avg_rating)

data/app/views/spree/api/reviews/show.json.jbuilder

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+json.partial!("spree/api/reviews/review", review: @review)

data/app/views/spree/feedback_reviews/_form.html.erb

@@ -1,13 +1,13 @@
-<%= render 'spree/feedback_reviews/summary', :review => review %>
-<%= form_for((@feedback_review ||= review.feedback_reviews.build), :url => feedback_reviews_path(review), :method => :post, :remote => true) do |f| %>
+<%= render 'spree/feedback_reviews/summary', review: review %>
+<%= form_for((@feedback_review ||= review.feedback_reviews.build), url: feedback_reviews_path(review), method: :post, remote: true) do |f| %>
 <% unless @feedback_review.errors.empty? %>
  <span class="error"><%= @feedback_review.errors[:rating] %></span>
  <br />
 <% end %>
-<%= Spree.t(:was_this_review_helpful) %>
+<%= I18n.t("spree.was_this_review_helpful") %>
 <% for i in 1..NB_STARS %>
   <%= radio_button_tag "feedback_review[rating]",
-                       Spree.t('star', :count => i), false, :class => "star" %>
+                       I18n.t("spree.star", count: i), false, class: "star" %>
 <% end %>
-<button class="feedback-review"><span><%= Spree.t(:say_yes) %></span></button>
+<button class="feedback-review"><span><%= I18n.t("spree.say_yes") %></span></button>
 <% end %>

data/app/views/spree/feedback_reviews/_summary.html.erb

@@ -1,6 +1,6 @@
 <p>
-  <%= Spree.t('voice', :count => review.feedback_reviews.count) %>.
-  <span title="<%= pluralize(review.feedback_stars, 'star') %> <%= Spree.t('out_of_5') %>">
-  <%= render 'spree/reviews/stars', :stars => review.feedback_stars %>
+  <%= I18n.t('spree.voice', count: review.feedback_reviews.count) %>.
+  <span title="<%= pluralize(review.feedback_stars, 'star') %> <%= I18n.t('spree.out_of_5') %>">
+  <%= render 'spree/reviews/stars', stars: review.feedback_stars %>
   </span> &nbsp;
 </p>

data/app/views/spree/feedback_reviews/create.js.erb

@@ -1,7 +1,7 @@
 <% if @feedback_review.valid? %>
-$("div#feedback_review_<%= @review.id %>").html("<%= escape_javascript(render('spree/feedback_reviews/summary', :review => @review)) %>");
+$("div#feedback_review_<%= @review.id %>").html("<%= escape_javascript(render('spree/feedback_reviews/summary', review: @review)) %>");
 <% else %>
-$("div#feedback_review_<%= @review.id %>").html("<%= escape_javascript(render('spree/feedback_reviews/form', :review => @review)) %>");
+$("div#feedback_review_<%= @review.id %>").html("<%= escape_javascript(render('spree/feedback_reviews/form', review: @review)) %>");
 
 <% end %>
 $(document).ready(function(){$("div#feedback_review_<%= @review.id %>").find(".star").rating({required:true});});

data/app/views/spree/reviews/_form.html.erb

@@ -1,34 +1,39 @@
-<%= form_for review, :url => product_reviews_path(product), :html => {:method => :post} do |f| %>
-  <%= render "spree/shared/error_messages", :target => review %>
+<%= form_for review, url: product_reviews_path(product), html: { method: :post, multipart: true} do |f| %>
+  <%= render "spree/shared/error_messages", target: review %>
 
   <p class="review_rating_field">
     <%= f.label :rating %> <span class="required">*</span><br />
-    <%= render "spree/reviews/stars", :stars => review.rating, :edit_enabled => true %>
+    <%= render "spree/reviews/stars", stars: review.rating, edit_enabled: true %>
   </p>
 
   <p class="review_name_field">
-    <%= f.label :name %> <span class="required">*</span><br />
-    <%= f.text_field :name, :maxlength => "255", :size => "50" %>
+    <%= f.label :name %><br />
+    <%= f.text_field :name, maxlength: "255", size: "50" %>
   </p>
 
   <p class="review_title_field">
     <%= f.label :title %><br />
-    <%= f.text_field :title, :maxlength => "255", :size => "50" %>
+    <%= f.text_field :title, maxlength: "255", size: "50" %>
   </p>
 
   <p class="review_review_field">
-    <%= f.label :review %> <span class="required">*</span><br />
-    <%= f.text_area :review, :wrap => "virtual", :rows => "10", :cols => "50" %>
+    <%= f.label :review %><br />
+    <%= f.text_area :review, wrap: "virtual", rows: "10", cols: "50" %>
+  </p>
+
+  <p class="review_images_field">
+    <%= f.label :images %><br>
+    <%= f.file_field :images, :accept => "image/*", multiple: true %>
   </p>
 
   <% if Spree::Reviews::Config[:render_show_identifier_checkbox] %>
     <p class="review_show_identifier_field">
       <%= f.label :show_identifier %><br />
-      <%= f.check_box :show_identifier, :wrap => "virtual", :rows => "10", :cols => "50", :checked => true %>
+      <%= f.check_box :show_identifier, wrap: "virtual", rows: "10", cols: "50", checked: true %>
     </p>
   <% end %>
 
   <p class="review_submit">
-    <%= f.submit Spree.t(:submit_your_review), :class => "button bg_darkfirst" %>
+    <%= f.submit I18n.t("spree.submit_your_review"), class: "button bg_darkfirst" %>
   </p>
 <% end %>

data/app/views/spree/reviews/new.html.erb

@@ -1,3 +1,3 @@
-<%= content_tag :h2, Spree.t(:leave_us_a_review_for, :name => @product.name), :class => 'new-review-title' %>
+<%= content_tag :h2, I18n.t("spree.leave_us_a_review_for", name: @product.name), class: 'new-review-title' %>
 
-<%= render 'form', :review => @review, :product => @product %>
+<%= render 'form', review: @review, product: @product %>

data/app/views/spree/shared/_rating.html.erb

@@ -1,13 +1,13 @@
 <% stars = product.stars %>
 <% reviews_count = product.reviews_count %>
 <div class="ratings">
-  <p><%= Spree.t('average_customer_rating') %>: </p>
+  <p><%= I18n.t('spree.average_customer_rating') %>: </p>
   <p class="ratings-stars">
     <span title="<%= txt_stars(stars) %>">
-      <%= render 'spree/reviews/stars', :stars => stars %>
+      <%= render 'spree/reviews/stars', stars: stars %>
     </span>
   </p>
-  <p class="ratings-basedupon">(<%= Spree.t('based_upon_review_count', :count => reviews_count) %>)</p>
+  <p class="ratings-basedupon">(<%= I18n.t('spree.based_upon_review_count', count: reviews_count) %>)</p>
   <div itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
     <meta itemprop="ratingValue" content="<%= stars %>" />
     <meta itemprop="reviewCount" content="<%= reviews_count %>" />

data/app/views/spree/shared/_review.html.erb

@@ -1,28 +1,38 @@
 <div class="review" itemprop="reviews" itemscope itemtype="http://schema.org/Review">
   <span class="reviews-rating" title="<%= txt_stars(review.rating) %>">
-    <%= render "spree/reviews/stars", :stars => review.rating %>
+    <%= render "spree/reviews/stars", stars: review.rating %>
   </span>
-  <span itemprop="name"><%= review.title %></span>
-  <br/>
-  <span class="attribution"><%= Spree.t(:submitted_on) %> <strong><%= l review.created_at.to_date %></strong></span>
-  <meta itemprop="datePublished" content="<%= review.created_at.to_date.to_s %>" />
+  <% if review.approved? || Spree::Reviews::Config[:display_unapproved_reviews] %>
+    <span itemprop="name"><%= review.title %></span>
+    <br/>
+    <span class="attribution"><%= I18n.t("spree.submitted_on") %> <strong><%= l review.created_at.to_date %></strong></span>
+    <meta itemprop="datePublished" content="<%= review.created_at.to_date.to_s %>" />
 
-  <meta itemprop="reviewRating" content="<%= review.rating %>" />
-  <% if review.show_identifier %>
-    <% if Spree::Reviews::Config[:show_email] && review.user %>
-      <span itemprop="author"><%= review.user.email %></span>
+    <meta itemprop="reviewRating" content="<%= review.rating %>" />
+    <% if review.show_identifier %>
+      <% if Spree::Reviews::Config[:show_email] && review.user %>
+        <span itemprop="author"><%= review.user.email %></span>
+      <% else %>
+        <span itemprop="author"><%= review.name %></span>
+      <% end %>
     <% else %>
-      <span itemprop="author"><%= review.name %></span>
+        <span itemprop="author"><%= I18n.t("spree.anonymous") %></span>
     <% end %>
-  <% else %>
-      <span itemprop="author"><%= Spree.t(:anonymous) %></span>
-  <% end %>
-  <div itemprop="reviewBody">
-    <%= simple_format(review.review) %>
-  </div>
-  <% if Spree::Reviews::Config[:feedback_rating] && (!Spree::Reviews::Config[:require_login] || spree_current_user) %>
-    <div class="feedback_review" id="feedback_review_<%= review.id %>">
-      <%= render "spree/feedback_reviews/form", :review => review %>
+    <% if Spree::Reviews::Config[:show_verified_purchaser] && review.verified_purchaser? %>
+      <div><%= I18n.t("spree.verified_purchaser") %></div>
+    <% end %>
+    <div itemprop="reviewBody">
+      <%= simple_format(review.review) %>
     </div>
+    <% review.images.each do |image| %>
+      <div itemprop="image">
+        <%= link_to image_tag(image.url(:product)), image.url(:original) %>
+      </div>
+    <% end %>
+    <% if Spree::Reviews::Config[:feedback_rating] && (!Spree::Reviews::Config[:require_login] || spree_current_user) %>
+      <div class="feedback_review" id="feedback_review_<%= review.id %>">
+        <%= render "spree/feedback_reviews/form", review: review %>
+      </div>
+    <% end %>
   <% end %>
 </div>

data/app/views/spree/shared/_review_summary.html.erb

@@ -1,9 +1,9 @@
 <div id="reviews">
-  <%= render 'spree/shared/rating', :locals => @product, :review => 0 %>
+  <%= render 'spree/shared/rating', locals: @product, review: 0 %>
   <% for review in (Spree::Reviews::Config[:track_locale] ? @product.reviews.localized(I18n.locale) : @product.reviews).default_approval_filter.preview %>
-    <%= render 'spree/shared/review', :review => review %>
+    <%= render 'spree/shared/review', review: review %>
   <% end %>
   <% if Spree::Reviews::Config[:feedback_rating] && (!Spree::Reviews::Config[:require_login] || spree_current_user) %>
-    <%= link_to Spree.t('write_your_own_review'), new_product_review_path(@product), :class => "button" %>
+    <%= link_to I18n.t("spree.write_your_own_review"), new_product_review_path(@product), class: "button" %>
   <% end %>
 </div>

data/app/views/spree/shared/_reviews.html.erb

@@ -1,15 +1,15 @@
 <div id="reviews">
-  <h6 class="product-section-title"><%= Spree.t(:reviews) %></h6>
+  <h6 class="product-section-title"><%= I18n.t("spree.reviews") %></h6>
   <% if Spree::Reviews::Config[:include_unapproved_reviews] == false and @product.reviews.approved.count == 0 %>
-    <p class="reviews-none"><%= Spree.t('no_reviews_available') %></p>
+    <p class="reviews-none"><%= I18n.t("spree.no_reviews_available") %></p>
   <% else %>
-    <%= render 'spree/shared/rating', :product => @product, :review => 0 %>
+    <%= render 'spree/shared/rating', product: @product, review: 0 %>
     <% for review in (Spree::Reviews::Config[:track_locale] ? @product.reviews.localized(I18n.locale) : @product.reviews).default_approval_filter.preview %>
-      <%= render 'spree/shared/review', :review => review %>
+      <%= render 'spree/shared/review', review: review %>
     <% end %>
   <% end %>
   <% if !Spree::Reviews::Config[:require_login] || spree_current_user %>
-    <%= link_to Spree.t('write_your_own_review'), new_product_review_path(@product), :class => "button",
-                :rel => 'nofollow' %>
+    <%= link_to I18n.t("spree.write_your_own_review"), new_product_review_path(@product), class: "button",
+                rel: 'nofollow' %>
   <% end %>
 </div>

data/app/views/spree/shared/_shortrating.html.erb

@@ -1,9 +1,9 @@
 <% stars = product.stars %>
 <% reviews_count = product.reviews_count %>
 <span style="float:left;" title="<%= txt_stars(stars) %>">
-  <%= render 'spree/reviews/stars', :stars => stars %>
+  <%= render 'spree/reviews/stars', stars: stars %>
 </span>
 <span style="float:right;">
-  <%= Spree::Review.model_name.human(:count => reviews_count) %>
+  <%= Spree::Review.model_name.human(count: reviews_count) %>
 </span>
 <br/>

data/bin/rails

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-ENGINE_PATH = File.expand_path('../..',  __FILE__)
-load File.expand_path('../../spec/dummy/script/rails',  __FILE__)
+ENGINE_PATH = File.expand_path('..', __dir__)
+load File.expand_path('../spec/dummy/script/rails', __dir__)

data/config/initializers/constants.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 NB_STARS = 5

data/config/initializers/load_preferences.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Reviews
     Config = Spree::ReviewsConfiguration.new

data/config/locales/de-CH.yml

@@ -15,6 +15,16 @@ de-CH:
       spree/review:
         one: eine Rezension
         other: "%{count} Rezensionen"
+    errors:
+      models:
+        spree/review:
+          attributes:
+            rating:
+              you_must_enter_value_for_rating: "Bitte geben Sie eine Bewertung an."
+        spree/feedback_review:
+          attributes:
+            rating:
+              you_must_enter_value_for_rating: "Bitte geben Sie eine Bewertung an."
   spree:
     approval_status: Freischaltungsstatus
     approve: Freischalten
@@ -41,16 +51,19 @@ de-CH:
     reviews: Rezensionen
     admin:
       tab:
+        reviews: Rezensionen
         review_management: Rezensionen
     review_successfully_submitted: "Ihre Rezension wurde erfolgreich übertragen. Vielen Dank!"
     spree_reviews:
       feedback_rating: Feedback für Rezensionen erlauben
+      display_unapproved: Zeigen Sie nicht genehmigte Bewertungen in Auflistungen an
       include_unapproved: Unveröffentlichte Rezensionen anzeigen
       manage_review_settings: Einstellungen für die Darstellung von Rezensionen
       preview_size: Größe der Vorschau
       require_login: Login erforderlich
       review_settings: Rezensionseinstellungen
       show_email: E-Mail Adressen anzeigen
+      show_verified_purchaser: Verifizierten Käufer anzeigen
       track_locale: Sprache des Benutzers tracken
     star:
       one: "ein Sternchen"
@@ -59,10 +72,10 @@ de-CH:
     submit_your_review: Rezension abschicken
     submitted_on: Eingeschickt am
     unapproved_reviews: Nicht freigeschaltete Rezensionen
+    verified_purchaser: Verifizierter Käufer
     voice:
       one: "Eine Stimme"
       other: "%{count} Stimmen"
     was_this_review_helpful: War diese Rezension für Sie hilfreich?
     write_your_own_review: Rezension schreiben
-    you_must_enter_value_for_rating: "Bitte geben Sie eine Bewertung an."
     anonymous: Anonym

data/config/locales/de.yml

@@ -15,6 +15,16 @@ de:
       spree/review:
         one: eine Rezension
         other: "%{count} Rezensionen"
+    errors:
+      models:
+        spree/review:
+          attributes:
+            rating:
+              you_must_enter_value_for_rating: "Bitte geben Sie eine Bewertung an."
+        spree/feedback_review:
+          attributes:
+            rating:
+              you_must_enter_value_for_rating: "Bitte geben Sie eine Bewertung an."
   spree:
     approval_status: Freischaltungsstatus
     approve: Freischalten
@@ -41,16 +51,19 @@ de:
     reviews: Rezensionen
     admin:
       tab:
+        reviews: Rezensionen
         review_management: Rezensionen
     review_successfully_submitted: Ihre Rezension wurde erfolgreich übertragen. Vielen Dank!
     spree_reviews:
       feedback_rating: Feedback für Rezensionen erlauben
+      display_unapproved: Zeigen Sie nicht genehmigte Bewertungen in Auflistungen an
       include_unapproved: Unveröffentlichte Rezensionen anzeigen
       manage_review_settings: Einstellungen für die Darstellung von Rezensionen
       preview_size: Größe der Vorschau
       require_login: Login erforderlich
       review_settings: Rezensionseinstellungen
       show_email: E-Mail Adressen anzeigen
+      show_verified_purchaser: Verifizierten Käufer anzeigen
       track_locale: Sprache des Benutzers tracken
     star:
       one: "ein Sternchen"
@@ -59,10 +72,10 @@ de:
     submit_your_review: Rezension abschicken
     submitted_on: Eingeschickt am
     unapproved_reviews: Nicht freigeschaltete Rezensionen
+    verified_purchaser: Verifizierter Käufer
     voice:
       one: "Eine Stimme"
       other: "%{count} Stimmen"
     was_this_review_helpful: War diese Rezension für Sie hilfreich?
     write_your_own_review: Rezension schreiben
-    you_must_enter_value_for_rating: "Bitte geben Sie eine Bewertung an."
     anonymous: Anonym

data/config/locales/en-GB.yml

@@ -14,6 +14,16 @@ en-GB:
       spree/review:
         one: one review
         other: "%{count} reviews"
+    errors:
+      models:
+        spree/review:
+          attributes:
+            rating:
+              you_must_enter_value_for_rating: "You must enter a value for rating."
+        spree/feedback_review:
+          attributes:
+            rating:
+              you_must_enter_value_for_rating: "You must enter a value for rating."
   spree:
     approval_status: Approval status
     approve: Approve
@@ -40,16 +50,19 @@ en-GB:
     reviews: Reviews
     admin:
       tab:
+        reviews: Reviews
         review_management: Reviews
     review_successfully_submitted: Review was successfully submitted
     spree_reviews:
       feedback_rating: Rate feedback
+      display_unapproved: Display unapproved reviews in listings
       include_unapproved: Include unapproved reviews in listings
       manage_review_settings: Control the display of reviews
       preview_size: Size of the review snippets
       require_login: Require user to be logged in
       review_settings: Review Settings
       show_email: Show email addresses
+      show_verified_purchaser: Show verified purchaser
       track_locale: Track user's locale
     star:
       one: "1"
@@ -58,11 +71,10 @@ en-GB:
     submit_your_review: Submit your review
     submitted_on: Submitted on
     unapproved_reviews: Unapproved
+    verified_purchaser: Verified purchaser
     voice:
       one: "1 voice"
       other: "%{count} voices"
     was_this_review_helpful: "Was this review helpful to you?"
     write_your_own_review: Write your own review
-    you_must_enter_value_for_rating: "You must enter a value for rating."
     anonymous: Anonymous
-

data/config/locales/en.yml

@@ -15,6 +15,16 @@ en:
       spree/review:
         one: one review
         other: "%{count} reviews"
+    errors:
+      models:
+        spree/review:
+          attributes:
+            rating:
+              you_must_enter_value_for_rating: "You must enter a value for rating."
+        spree/feedback_review:
+          attributes:
+            rating:
+              you_must_enter_value_for_rating: "You must enter a value for rating."
   spree:
     approval_status: Approval status
     approve: Approve
@@ -40,16 +50,19 @@ en:
     reviews: Reviews
     admin:
       tab:
+        reviews: Reviews
         review_management: Reviews
     review_successfully_submitted: Review was successfully submitted
     spree_reviews:
       feedback_rating: Rate feedback
+      display_unapproved: Display unapproved reviews in listings
       include_unapproved: Include unapproved reviews in listings
       manage_review_settings: Control the display of reviews
       preview_size: Size of the review snippets
       require_login: Require user to be logged in
       review_settings: Review Settings
       show_email: Show email addresses
+      show_verified_purchaser: Show verified purchaser
       track_locale: Track user's locale
     star:
       one: "1"
@@ -58,10 +71,10 @@ en:
     submit_your_review: Submit your review
     submitted_on: Submitted on
     unapproved_reviews: Unapproved
+    verified_purchaser: Verified purchaser
     voice:
       one: "1 voice"
       other: "%{count} voices"
     was_this_review_helpful: "Was this review helpful to you?"
     write_your_own_review: Write your own review
-    you_must_enter_value_for_rating: "You must enter a value for rating."
     anonymous: Anonymous