solidus_reviews 1.0.0 → 1.1.0

data/app/overrides/add_reviews_to_admin_configuration_sidebar.rb

@@ -1,5 +1,13 @@
-Deface::Override.new(:virtual_path => "spree/admin/shared/_configuration_menu",
-                     :name => "converted_admin_configurations_menu",
-                     :insert_bottom => "[data-hook='admin_configurations_sidebar_menu'], #admin_configurations_sidebar_menu[data-hook]",
-                     :text => "<%= configurations_sidebar_menu_item Spree.t('spree_reviews.review_settings'), edit_admin_review_settings_path %>",
-                     :disabled => false)
+# frozen_string_literal: true
+
+Spree::Backend::Config.configure do |config|
+  config.menu_items.detect { |menu_item|
+    menu_item.label == :settings
+  }.sections << :review_settings
+end
+
+Deface::Override.new(virtual_path: "spree/admin/shared/_settings_sub_menu",
+                     name: "converted_admin_configurations_menu",
+                     insert_bottom: "[data-hook='admin_settings_sub_tabs']",
+                     text: "<%= tab :reviews, url: spree.edit_admin_review_settings_path, match_path: /review_settings/ %>",
+                     disabled: false)

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

@@ -1,9 +1,9 @@
 <% content_for :page_title do %>
-	<%= Spree.t('feedback_review_for', :review => @review.title) %>
+	<%= I18n.t("spree.feedback_review_for", review: @review.title) %>
 <% end %>
 
 <% content_for :page_actions do %>
-	<li><%= button_link_to Spree.t(:back_to_reviews), admin_reviews_path, { :icon => 'icon-arrow-left' } %></li>
+	<li><%= link_to I18n.t("spree.back_to_reviews"), admin_reviews_path %></li>
 <% end %>
 
 <% render 'spree/admin/shared/product_sub_menu' %>
@@ -18,20 +18,20 @@
 		</colgroup>
 		<thead>
 			<tr>
-				<th><%= Spree.t('user') %></th>
-				<th><%= Spree.t('stars') %></th>
-				<th><%= Spree.t('date') %></th>
-				<th></th>
+				<th><%= I18n.t("spree.user") %></th>
+				<th><%= I18n.t("spree.stars") %></th>
+				<th><%= I18n.t("spree.date") %></th>
+				<th class="actions"></th>
 			</tr>
 		</thead>
 		<tbody>
 		<%- @collection.each do |feedback| -%>
 			<tr id="<%= dom_id(feedback) %>">
 			  <td><%= l feedback.created_at %></td>
-			  <td><%= feedback.user.try(:login) || Spree.t(:anonymous) %></td>
+			  <td><%= feedback.user.try(:login) || I18n.t("spree.anonymous") %></td>
 			  <td><%= feedback.rating %></td>
 			  <td class="actions">
-				  <%= link_to_delete feedback, :no_text => true  %>
+				  <%= link_to_delete feedback, no_text: true  %>
 			  </td>
 			</tr>
 		<% end %>
@@ -39,6 +39,6 @@
 	</table>
 <% else %>
 	<div class="no-objects-found">
-		<%= Spree.t(:no_results) %>
+		<%= I18n.t("spree.no_results") %>
 	</div>
 <% end %>

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

@@ -1,40 +1,69 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-	<%= Spree.t("spree_reviews.review_settings") %>
+  <%= I18n.t("spree.spree_reviews.review_settings") %>
+<% end %>
+
+<% admin_breadcrumb(I18n.t("spree.settings")) %>
+
+<% content_for :tabs do %>
+  <nav>
+    <ul class="tabs">
+      <%= settings_tab_item I18n.t("spree.spree_reviews.review_settings"), spree.admin_review_settings_path %>
+    </ul>
+  </nav>
 <% end %>
 
-<%= form_tag(admin_review_settings_path, :method => :put) do %>
-	<fieldset class="no-border-top">
-		<div class="field">
-			<%= check_box_tag('preferences[include_unapproved_reviews]', "1", Spree::Reviews::Config[:include_unapproved_reviews]) %>
-			<label><%= Spree.t("spree_reviews.include_unapproved") %></label>
-		</div>
-		<div class="field">
-			<%= check_box_tag('preferences[feedback_rating]', "1", Spree::Reviews::Config[:feedback_rating]) %>
-			<label><%= Spree.t("spree_reviews.feedback_rating") %></label>
-		</div>
-		<div class="field">
-			<%= check_box_tag('preferences[show_email]', "1", Spree::Reviews::Config[:show_email]) %>
-			<label><%= Spree.t("spree_reviews.show_email") %></label>
-		</div>
-		<div class="field">
-			<%= check_box_tag('preferences[require_login]', "1", Spree::Reviews::Config[:require_login]) %>
-			<label><%= Spree.t("spree_reviews.require_login") %></label>
-		</div>
-		<div class="field">
-			<%= check_box_tag('preferences[track_locale]', "1", Spree::Reviews::Config[:track_locale]) %>
-			<label><%= Spree.t("spree_reviews.track_locale") %></label>
-		</div>
-		<div class="field">
-			<label><%= Spree.t('spree_reviews.preview_size') %></label><br>
-			<%= text_field_tag('preferences[preview_size]', Spree::Reviews::Config[:preview_size], :size => 3) %>
-		</div>
+<%= form_tag(admin_review_settings_path, method: :put) do %>
+  <fieldset class="no-border-top">
+    <div class="field">
+      <label>
+        <%= check_box_tag('preferences[include_unapproved_reviews]', "1", Spree::Reviews::Config[:include_unapproved_reviews]) %>
+        <%= I18n.t("spree.spree_reviews.include_unapproved") %>
+      </label>
+    </div>
+    <div class="field">
+      <label>
+        <%= check_box_tag('preferences[display_unapproved_reviews]', "1", Spree::Reviews::Config[:display_unapproved_reviews]) %>
+        <%= I18n.t("spree.spree_reviews.display_unapproved") %>
+      </label>
+    </div>
+    <div class="field">
+      <label>
+        <%= check_box_tag('preferences[feedback_rating]', "1", Spree::Reviews::Config[:feedback_rating]) %>
+        <%= I18n.t("spree.spree_reviews.feedback_rating") %>
+      </label>
+    </div>
+    <div class="field">
+      <label>
+        <%= check_box_tag('preferences[show_email]', "1", Spree::Reviews::Config[:show_email]) %>
+        <%= I18n.t("spree.spree_reviews.show_email") %>
+      </label>
+    </div>
+    <div class="field">
+      <label>
+        <%= check_box_tag('preferences[show_verified_purchaser]', "1", Spree::Reviews::Config[:show_verified_purchaser]) %>
+        <%= I18n.t("spree.spree_reviews.show_verified_purchaser") %>
+      </label>
+    </div>
+    <div class="field">
+      <label>
+        <%= check_box_tag('preferences[require_login]', "1", Spree::Reviews::Config[:require_login]) %>
+        <%= I18n.t("spree.spree_reviews.require_login") %>
+      </label>
+    </div>
+    <div class="field">
+      <label>
+        <%= check_box_tag('preferences[track_locale]', "1", Spree::Reviews::Config[:track_locale]) %>
+        <%= I18n.t("spree.spree_reviews.track_locale") %>
+      </label>
+    </div>
+    <div class="field">
+      <label><%= I18n.t("spree.spree_reviews.preview_size") %></label><br>
+      <%= text_field_tag('preferences[preview_size]', Spree::Reviews::Config[:preview_size], size: 3) %>
+    </div>
 
-		<div class="form-buttons filter-actions actions" data-hook="buttons">
-			<%= button Spree.t('actions.update'), 'icon-refresh' %>
-			<span class="or"><%= Spree.t(:or) %></span>
-			<%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' %>
-		</div>
-	</fieldset>
+    <div class="form-buttons filter-actions actions" data-hook="buttons">
+      <%= button_tag I18n.t("spree.actions.update") %>
+      <%= link_to I18n.t("spree.actions.cancel"), edit_admin_general_settings_url, class: 'button' %>
+    </div>
+  </fieldset>
 <% end %>

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", link: link_to(@review.product.name, product_path(@review.product))) %>
 <% end %>
 
 <% render 'spree/admin/shared/product_sub_menu' %>
@@ -15,7 +15,7 @@
 	</div>
 
 	<div class="omega eight columns">
-		<%= render 'form', :f => f %>
+		<%= render 'form', f: f %>
 	</div>
 
 	<div class="clear"></div>

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

@@ -1,111 +1,123 @@
+<% 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') %>
+  <%= I18n.t("spree.search") %>
 <% 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">
+            <%= 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">
+            <%= 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 %>
+          </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/_review.json.jbuilder

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