solidus_reviews 1.0.0 → 1.4.0

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

@@ -1,22 +1,43 @@
-<%= render "spree/shared/error_messages", :target => @review %>
+<%= render "spree/shared/error_messages", target: @review %>
 <%= f.field_container :name do %>
   <%= f.label :name %><br />
-  <%= f.text_field :name, :maxlength => "255", :size => "60" %>
+  <%= f.text_field :name, maxlength: "255", size: "60" %>
+<% end %>
+
+<%= f.field_container :email do %>
+  <%= f.label :email %><br />
+  <%= mail_to @review.email %>
 <% end %>
 
 <%= f.field_container :title do %>
   <%= f.label :title %><br />
-  <%= f.text_field :title, :maxlength => "255", :size => "60" %>
+  <%= f.text_field :title, maxlength: "255", size: "60" %>
 <% end %>
 
 <%= f.field_container :review do %>
   <%= f.label :review %><br />
-  <%= f.text_area :review, :wrap => "virtual", :rows => "10", :cols => "60" %>
+  <%= f.text_area :review, wrap: "virtual", rows: "10", cols: "60" %>
+<% end %>
+
+<%= f.field_container :images do %>
+  <%= f.label :images %>
+  <table>
+    <% @review.images.each do |image| %>
+      <tr>
+        <td>
+          <%= image_tag image.url(:original) %>
+        </td>
+        <td>
+          <%= link_to_delete image, url: admin_review_image_url(@review, image, product_id: @review.product), no_text: true  %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
 <% end %>
 
 <% if Spree::Reviews::Config[:track_locale] %>
 <%= f.field_container :locale do %>
   <%= f.label :locale %><br />
-  <%= f.select :locale, I18n.available_locales.map { |lc| [t(lc, :default => lc.to_s), lc.to_s] } %>
+  <%= f.select :locale, I18n.available_locales.map { |lc| [t(lc, default: lc.to_s), lc.to_s] } %>
 <% end %>
 <% end %>

data/app/views/spree/admin/reviews/edit.html.erb

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-	<%= Spree.t(:editing_review_for_html, :link => link_to(@review.product.name, product_path(@review.product))) %>
+	<%= I18n.t("spree.editing_review_for_html", product_name: @review.product.name) %>
 <% end %>
 
 <% render 'spree/admin/shared/product_sub_menu' %>
@@ -15,12 +15,14 @@
 	</div>
 
 	<div class="omega eight columns">
-		<%= render 'form', :f => f %>
+		<%= render 'form', f: f %>
 	</div>
 
 	<div class="clear"></div>
 
 	<fieldset class="no-border-top">
-		<%= render 'spree/admin/shared/edit_resource_links' %>
+		<% if can? :manage, Spree::Review %>
+			<%= render 'spree/admin/shared/edit_resource_links' %>
+		<% end %>
 	</fieldset>
 <% end %>

data/app/views/spree/admin/reviews/index.html.erb

@@ -1,111 +1,127 @@
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
+
 <% content_for :page_title do %>
-	<%= Spree.t('reviews') %>
+  <%= I18n.t("spree.reviews") %>
 <% end %>
 
-<% render 'spree/admin/shared/product_sub_menu' %>
-
 <% content_for :table_filter_title do %>
-	<%= Spree.t('search') %>
+  <% if can? :display, Spree::Review %>
+    <%= I18n.t("spree.search") %>
+  <% end %>
 <% end %>
 
 <% content_for :table_filter do %>
   <div data-hook="admin_reviews_index_search">
-
     <%= search_form_for [:admin, @search] do |f| %>
-		<div class="alpha three columns">
-			<div class="field">
-				<%= label_tag nil, Spree.t(:user) %><br />
-				<%= f.text_field :name_cont, :size => 25 %>
-			</div>
-		</div>
+      <div class="alpha three columns">
+        <div class="field">
+          <%= f.label :name_cont, I18n.t("spree.user") %><br />
+          <%= f.text_field :name_cont, class: 'fullwidth' %>
+        </div>
+      </div>
 
-		<div class="seven columns">
-			<div class="field">
-				<%= label_tag nil, Spree.t(:title) -%><br/>
-				<%= f.text_field :title_cont, :size => 25  -%>
-			</div>
-		</div>
+      <div class="seven columns">
+        <div class="field">
+          <%= f.label :title_cont, I18n.t("spree.title") -%><br/>
+          <%= f.text_field :title_cont, class: 'fullwidth'  -%>
+        </div>
+      </div>
 
-		<div class="four columns">
-			<div class="field">
-				<%= label_tag nil, Spree.t(:review) -%><br/>
-				<%= f.text_field :review_cont, :size => 25  -%>
-			</div>
-		</div>
+      <div class="four columns">
+        <div class="field">
+          <%= f.label :review_cont, I18n.t("spree.review") -%><br/>
+          <%= f.text_field :review_cont, class: 'fullwidth'  -%>
+        </div>
+      </div>
 
-		<div class="two columns omega">
-			<div class="field">
-				<%= label_tag nil, Spree.t(:approval_status)-%><br/>
-				<%= f.select :approved_eq, [[Spree.t('all'), nil], [Spree.t('approved_reviews'), true], [Spree.t('unapproved_reviews'), false]]  -%>
-			</div>
-		</div>
+      <div class="two columns omega">
+        <div class="field">
+          <%= f.label :approved_eq, I18n.t("spree.approval_status")-%><br/>
+          <%= f.select :approved_eq, [
+              [I18n.t("spree.all"), nil],
+              [I18n.t("spree.approved_reviews"), true],
+              [I18n.t("spree.unapproved_reviews"), false]
+            ], {}, class: 'select2 fullwidth'  -%>
+        </div>
+      </div>
 
-		<div class="clear"></div>
+      <div class="clear"></div>
 
-		<div class="form-buttons actions filter-actions" data-hook="admin_reviews_index_search_buttons">
-			<%= button Spree.t(:search), 'icon-search' %>
-		</div>
+      <div class="form-buttons actions filter-actions" data-hook="admin_reviews_index_search_buttons">
+        <%= button_tag I18n.t("spree.search") %>
+      </div>
     <%- end -%>
   </div>
 <%- end -%>
 
-<% paginate @reviews %>
+<%= paginate @reviews, theme: "solidus_admin" %>
 
 <% if @reviews.any? %>
-	<table class="index">
-		<colgroup>
-			<col style="width: 25%;">
-			<col style="width: 10%;">
-			<col style="width: 10%;">
-			<col style="width: 20%;">
-			<col style="width: 15%;">
-			<col style="width: 17%;">
-		</colgroup>
-		<thead>
-			<tr>
-				<th><%= Spree.t('product') %></th>
-				<th><%= Spree::Review.human_attribute_name(:rating) %></th>
-				<th><%= Spree.t('feedback') %></th>
-				<th><%= Spree::Review.human_attribute_name(:user) %></th>
-				<th><%= Spree::Review.human_attribute_name(:created_at) %></th>
-			</tr>
-		</thead>
-		<tbody>
-		<%- @reviews.each do |review| -%>
-			<tr id="<%= dom_id review %>">
-				<td>
-					<% if review.product %>
-						<%= link_to review.product.name, product_path(review.product) %>
-					<% end %>
-				</td>
-				<td class="align-center">
-					<%= txt_stars(review.rating) %>
-				</td>
-				<td class="align-center">
-					<%= link_to "(#{review.feedback_stars}/#{review.feedback_reviews.size})", admin_review_feedback_reviews_path(review) %>
-				</td>
-				<td class="align-center">
-					<%= review.user_id ? link_to(review.user.try(:email), [:admin, review.user]) : Spree.t(:anonymous) %></p>
-					<p><%= Spree::Review.human_attribute_name(:ip_address) %>: <%= review.ip_address ? link_to(review.ip_address, "http://whois.domaintools.com/#{review.ip_address}") : '-' %></p>
-				</td>
-				<td class="align-center">
-					<%= l review.created_at, :format => :short %>
-				</td>
-				<td class="actions">
-					<%= link_to_with_icon 'check', Spree.t('approve'), approve_admin_review_url(review), :no_text => true, class: 'approve' unless review.approved %>
-					&nbsp;
-					<%= link_to_edit review, :no_text => true, :class => 'edit' %>
-					&nbsp;
-					<%= link_to_delete review, :no_text => true %>
-				</td>
-			</tr>
-		<% end %>
-		</tbody>
-	</table>
+  <table class="index">
+    <colgroup>
+      <col style="width: 20%;">
+      <col style="width: 10%;">
+      <col style="width: 10%;">
+      <col style="width: 15%;">
+      <col style="width: 15%;">
+      <col style="width: 15%;">
+      <col style="width: 17%;">
+    </colgroup>
+    <thead>
+      <tr>
+        <th><%= I18n.t("spree.product") %></th>
+        <th><%= "#{Spree::Review.human_attribute_name(:rating)}/#{I18n.t("spree.feedback")}" %></th>
+        <th><%= I18n.t("spree.verified_purchaser") %></th>
+        <th><%= Spree::Review.human_attribute_name(:user) %></th>
+        <th><%= Spree::Review.human_attribute_name(:created_at) %></th>
+        <th><%= Spree::Review.human_attribute_name(:images) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <%- @reviews.each do |review| -%>
+        <tr id="<%= dom_id review %>">
+          <td>
+            <% if review.product %>
+              <%= link_to review.product.name, product_path(review.product) %>
+            <% end %>
+            </td>
+          <td class="align-center">
+            <%= txt_stars(review.rating) %><br />
+            <%= link_to "(#{review.feedback_stars}/#{review.feedback_reviews.size})", admin_review_feedback_reviews_path(review) %>
+          </td>
+          <td class="align-center">
+            <% if review.verified_purchaser? %>
+              <%= solidus_icon('fa fa-check') %>
+            <% end %>
+          </td>
+          <td class="align-center">
+            <p><%= review.user_id ? link_to(review.user.try(:email), [:admin, review.user]) : I18n.t("spree.anonymous") %></p>
+            <p><%= Spree::Review.human_attribute_name(:ip_address) %>: <%= review.ip_address ? link_to(review.ip_address, "http://whois.domaintools.com/#{review.ip_address}") : '-' %></p>
+          </td>
+          <td class="align-center">
+            <%= l review.created_at, format: :short %>
+          </td>
+          <td class="align-center">
+            <% review.images.each do |image| %>
+              <%= link_to image_tag(image.url(:product)), image.url(:original) %>
+            <% end %>
+          </td>
+          <td class="actions">
+            <% if can? :manage, Spree::Review %>
+              <%= link_to_with_icon 'ok', I18n.t("spree.approve"), approve_admin_review_url(review), no_text: true, class: 'approve' unless review.approved %>
+              <%= link_to_edit review, no_text: true, class: 'edit' %>
+              <%= link_to_delete review, no_text: true %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
 <% else %>
-	<div class="no-objects-found">
-		<%= Spree.t(:no_results) %>
-	</div>
+  <div class="no-objects-found">
+    <%= I18n.t("spree.no_results") %>
+  </div>
 <% end %>
 
-<%= paginate @reviews -%>
+<%= paginate @reviews, theme: "solidus_admin" -%>

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

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+json.cache! [I18n.locale, feedback_review] do
+  json.call(feedback_review, *feedback_review_attributes)
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+json.cache! [I18n.locale, review] do
+  json.call(review, *review_attributes)
+  json.images(review.images) do |image|
+    json.partial!("spree/api/images/image", image: image)
+  end
+  json.feedback_reviews(review.feedback_reviews) do |feedback_review|
+    json.partial!("spree/api/reviews/feedback_review", feedback_review: feedback_review)
+  end
+end

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,41 @@
-<%= 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>
 
+  <% if Spree::Reviews::Config[:allow_image_upload] %>
+    <p class="review_images_field">
+      <%= f.label :images %><br>
+      <%= f.file_field :images, :accept => "image/*", multiple: true %>
+    </p>
+  <% end %>
+
   <% 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/edit.html.erb

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

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,40 @@
 <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>
+    <% if Spree::Reviews::Config[:allow_image_upload] %>
+      <% review.images.each do |image| %>
+        <div itemprop="image">
+          <%= link_to image_tag(image.url(:product)), image.url(:original) %>
+        </div>
+      <% end %>
+    <% 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>