workarea-admin 3.4.45 → 3.5.0.beta.1

data/app/controllers/workarea/admin/catalog_products_controller.rb

@@ -64,21 +64,19 @@ module Workarea
     end
 
     def set_details
-      @product.details = HashUpdate.new(
-        original: @product.details,
+      HashUpdate.new(
         adds: params[:new_details],
         updates: params[:details],
         removes: params[:details_to_remove]
-      ).result
+      ).apply(@product.details)
     end
 
     def set_filters
-      @product.filters = HashUpdate.new(
-        original: @product.filters,
+      HashUpdate.new(
         adds: params[:new_filters],
         updates: params[:filters],
         removes: params[:filters_to_remove]
-      ).result
+      ).apply(@product.filters)
     end
   end
 end

data/app/controllers/workarea/admin/catalog_variants_controller.rb

@@ -83,12 +83,11 @@ module Workarea
     end
 
     def set_details
-      @variant.details = HashUpdate.new(
-        original: @variant.details,
+      HashUpdate.new(
         adds: params[:new_details],
         updates: params[:details],
         removes: params[:details_to_remove]
-      ).result
+      ).apply(@variant.details)
     end
   end
 end

data/app/controllers/workarea/admin/comments_controller.rb

@@ -48,6 +48,15 @@ module Workarea
         redirect_to commentable_comments_path(@commentable.to_global_id)
       end
 
+      def subscribe
+        @commentable.add_subscription(current_user.id)
+        flash[:success] = t(
+          'workarea.admin.comments.flash_messages.comment_subscribed',
+          commentable: @commentable.name
+        )
+        redirect_to commentable_comments_path(@commentable.to_global_id)
+      end
+
       def unsubscribe
         @commentable.remove_subscription(current_user.id)
         flash[:success] = t(

data/app/controllers/workarea/admin/configurations_controller.rb

@@ -0,0 +1,29 @@
+module Workarea
+  module Admin
+    class ConfigurationsController < Admin::ApplicationController
+      before_action :find_configuration
+
+      def show; end
+
+      def update
+        if @configuration.update(configuration_params)
+          flash[:success] = t('workarea.admin.configurations.flash_messages.configuration_updated')
+          redirect_to configuration_path
+        else
+          flash[:error] = t('workarea.admin.configurations.flash_messages.configuration_error')
+          render :show
+        end
+      end
+
+      private
+
+      def find_configuration
+        @configuration = Configuration::Admin.instance
+      end
+
+      def configuration_params
+        Configuration::Params.new(params[:configuration].to_unsafe_h).to_h
+      end
+    end
+  end
+end

data/app/controllers/workarea/admin/content_assets_controller.rb

@@ -7,7 +7,9 @@ module Workarea
     after_action :track_index_filters, only: :index
 
     def index
-      DirectUpload.ensure_cors!(request.url) if Configuration::S3.configured?
+      if Configuration::S3.configured? && !request.xhr?
+        DirectUpload.ensure_cors!(request.url)
+      end
 
       search = Search::AdminAssets.new(params)
       @search = Admin::SearchViewModel.new(search, view_model_options)

data/app/controllers/workarea/admin/content_blocks_controller.rb

@@ -53,13 +53,7 @@ module Workarea
     end
 
     def destroy
-      if current_release.present?
-        @block.active = false
-        @block.save
-      else
-        @block.destroy
-      end
-
+      @block.destroy
       flash[:success] = t('workarea.admin.content_blocks.flash_messages.removed')
       redirect_to return_to || edit_content_path(@content)
     end

data/app/controllers/workarea/admin/create_catalog_products_controller.rb

@@ -74,14 +74,8 @@ module Workarea
       end
 
       def save_details
-        @product.filters = HashUpdate
-          .new(original: @product.filters, updates: params[:filters])
-          .result
-
-        @product.details = HashUpdate
-          .new(original: @product.details, updates: params[:details])
-          .result
-
+        HashUpdate.new(updates: params[:filters]).apply(@product.filters)
+        HashUpdate.new(updates: params[:details]).apply(@product.details)
         @product.save!
 
         flash[:success] = t('workarea.admin.create_catalog_products.flash_messages.saved')

data/app/controllers/workarea/admin/create_release_undos_controller.rb

@@ -0,0 +1,43 @@
+module Workarea
+  module Admin
+    class CreateReleaseUndosController < Admin::ApplicationController
+      required_permissions :releases
+
+      before_action :find_release
+      before_action :find_undo_release
+
+      def new
+      end
+
+      def create
+        @undo_release.attributes = params[:release]
+
+        if @undo_release.save
+          @release.changesets.each do |changeset|
+            changeset.build_undo(release: @undo_release.model).save!
+          end
+
+          flash[:success] = t('workarea.admin.create_release_undos.flash_messages.saved')
+          redirect_to review_release_undo_path(@release)
+        else
+          render :new, status: :unprocessable_entity
+        end
+      end
+
+      def review
+      end
+
+      private
+
+      def find_release
+        model = Release.find(params[:release_id])
+        @release = ReleaseViewModel.new(model, view_model_options)
+      end
+
+      def find_undo_release
+        model = @release.model.undo || @release.build_undo(params[:release])
+        @undo_release = ReleaseViewModel.new(model, view_model_options)
+      end
+    end
+  end
+end

data/app/controllers/workarea/admin/create_segments_controller.rb

@@ -0,0 +1,68 @@
+module Workarea
+  module Admin
+    class CreateSegmentsController < Admin::ApplicationController
+      required_permissions :people
+
+      before_action :find_segment
+      before_action :find_rules, only: [:rules, :new_rule, :edit_rule]
+      before_action :find_rule, only: [:new_rule, :edit_rule]
+
+      def index
+        render :setup
+      end
+
+      def create
+        @segment.attributes = params[:segment]
+
+        if @segment.save
+          flash[:success] = t('workarea.admin.create_segments.flash_messages.saved')
+          redirect_to rules_create_segment_path(@segment)
+        else
+          render :setup, status: :unprocessable_entity
+        end
+      end
+
+      def edit
+      end
+
+      def rules
+      end
+
+      def new_rule
+        render :rules
+      end
+
+      def edit_rule
+        render :rules
+      end
+
+      def review
+      end
+
+      private
+
+      def find_segment
+        model = if params[:id].present?
+                  Segment.find(params[:id])
+                else
+                  Segment.new(params[:segment])
+                end
+
+        @segment = SegmentViewModel.wrap(model, view_model_options)
+      end
+
+      def find_rules
+        @rules = @segment.rules.select(&:persisted?)
+      end
+
+      def find_rule
+        @rule = if params[:rule_id].present?
+          @segment.rules.where(id: params[:rule_id]).first
+        else
+          klass = "Workarea::Segment::Rules::#{params[:rule_type].to_s.camelize}"
+          @segment.model.rules.build(params[:rule], klass.constantize)
+        end
+      end
+    end
+  end
+end

data/app/controllers/workarea/admin/dashboards_controller.rb

@@ -41,6 +41,8 @@ module Workarea
       @settings = configuration.reject do |key, _value|
         Workarea.config.hide_from_settings.include?(key)
       end
+
+      @configuration = Configuration::Admin.instance
     end
 
     # Override to provide permissions per-dashboard

data/app/controllers/workarea/admin/data_file_imports_controller.rb

@@ -1,6 +1,7 @@
 module Workarea
   module Admin
     class DataFileImportsController < Admin::ApplicationController
+      before_action :check_publishing_authorization
       before_action :set_import
 
       def new
@@ -8,7 +9,7 @@ module Workarea
 
       def sample
         filename = "#{@import.name.downcase.underscore}.#{@import.file_type}"
-        send_data @import.sample_file_content, filename: filename, type: @import.mime_type, disposition: :attachment
+        send_data @import.sample_file_content, filename: filename, type: @import.file_type
       end
 
       def create
@@ -28,7 +29,11 @@ module Workarea
 
       def import_params
         base = params.select { |k, v| k.in?(DataFile::Import.fields.keys) }
-        base.merge(params[:import] || {}).merge(created_by_id: current_user.id)
+        base.merge(params[:import] || {})
+            .merge(
+              created_by_id: current_user.id,
+              release_id: params[:publishing]
+            )
       end
     end
   end

data/app/controllers/workarea/admin/fulfillment_skus_controller.rb

@@ -0,0 +1,58 @@
+module Workarea
+  module Admin
+    class FulfillmentSkusController < Admin::ApplicationController
+      required_permissions :catalog
+
+      before_action :find_sku, except: :index
+      after_action :track_index_filters, only: :index
+
+      def index
+        search = Search::AdminFulfillmentSkus.new(view_model_options)
+        @search = SearchViewModel.new(search, view_model_options)
+      end
+
+      def show; end
+
+      def create
+        if @sku.save
+          flash[:success] =
+            t('workarea.admin.fulfillment_skus.flash_messages.created', id: @sku.id)
+          redirect_to fulfillment_sku_path(@sku)
+        else
+          render :new, status: :unprocessable_entity
+        end
+      end
+
+      def edit; end
+
+      def update
+        if @sku.update(params[:sku])
+          flash[:success] = t('workarea.admin.fulfillment_skus.flash_messages.saved', id: @sku.id)
+          redirect_to fulfillment_sku_path(@sku)
+        else
+          render :edit, status: :unprocessable_entity
+        end
+      end
+
+      def destroy
+        @sku.destroy
+
+        flash[:success] = t('workarea.admin.fulfillment_skus.flash_messages.removed', id: @sku.id)
+        redirect_to fulfillment_skus_path
+      end
+
+      private
+
+      def find_sku
+        model =
+          if params[:id].present?
+            Fulfillment::Sku.find_or_create_by(id: params[:id])
+          else
+            Fulfillment::Sku.new(params[:sku])
+          end
+
+        @sku = FulfillmentSkuViewModel.new(model)
+      end
+    end
+  end
+end

data/app/controllers/workarea/admin/fulfillment_tokens_controller.rb

@@ -0,0 +1,56 @@
+module Workarea
+  module Admin
+    class FulfillmentTokensController < Admin::ApplicationController
+      required_permissions :catalog
+
+      before_action :find_sku
+      before_action :find_token, only: :update
+
+      def index
+        @tokens =
+          Fulfillment::Token
+            .for_sku(@sku.id)
+            .page(params[:page])
+            .per(Workarea.config.per_page)
+            .order_by(find_sort(Fulfillment::Token))
+      end
+
+      def create
+        @token = Fulfillment::Token.new(sku: @sku.id)
+
+        if @token.save
+          flash[:success] = t('workarea.admin.fulfillment_tokens.flash_messages.created')
+        else
+          flash[:error] = t('workarea.admin.fulfillment_tokens.flash_messages.error')
+        end
+
+        redirect_to fulfillment_sku_tokens_path(@sku, new_token: @token.id)
+      end
+
+      def update
+        result = @token.update(params[:token])
+
+        if result && @token.enabled?
+          flash[:success] = t('workarea.admin.fulfillment_tokens.flash_messages.enabled')
+        elsif result
+          flash[:success] = t('workarea.admin.fulfillment_tokens.flash_messages.disabled')
+        else
+          flash[:error] = t('workarea.admin.fulfillment_tokens.flash_messages.update_failed')
+        end
+
+        redirect_back_or fulfillment_sku_tokens_path(@sku)
+      end
+
+      private
+
+      def find_sku
+        model = Fulfillment::Sku.find(params['fulfillment_sku_id'])
+        @sku = Admin::FulfillmentSkuViewModel.wrap(model, view_model_options)
+      end
+
+      def find_token
+        @token = Fulfillment::Token.find(params[:id])
+      end
+    end
+  end
+end

data/app/controllers/workarea/admin/guest_browsings_controller.rb

@@ -6,7 +6,7 @@ module Workarea
 
       def create
         admin_browse_as_guest
-        self.current_order = nil
+        clear_current_order
 
         flash[:success] =
           t('workarea.admin.guest_browsing.flash_messages.started')
@@ -15,7 +15,7 @@ module Workarea
 
       def destroy
         stop_admin_guest_browsing
-        self.current_order = nil
+        clear_current_order
 
         flash[:success] = t('workarea.admin.guest_browsing.flash_messages.stopped')
         redirect_to users_path

data/app/controllers/workarea/admin/impersonations_controller.rb

@@ -22,13 +22,12 @@ module Workarea
       end
 
       def destroy
-        previous_user_id = cookies.signed[:user_id]
+        previous_user_id = session[:user_id]
         stop_impersonation
-        self.current_order = nil
+        clear_current_order
 
         flash[:success] = t('workarea.admin.users.flash_messages.stopped')
-        referrer = URI.parse(request.referrer).request_uri rescue nil
-        redirect_back_or(referrer.presence || user_path(previous_user_id))
+        redirect_to user_path(previous_user_id)
       end
     end
   end

data/app/controllers/workarea/admin/orders_controller.rb

@@ -19,6 +19,9 @@ module Workarea
     def timeline
     end
 
+    def fraud
+    end
+
     private
 
     def find_order

data/app/controllers/workarea/admin/pricing_discount_redemptions_controller.rb

@@ -0,0 +1,13 @@
+module Workarea
+  module Admin
+    class PricingDiscountRedemptionsController < Admin::ApplicationController
+      required_permissions :marketing
+
+      def index
+        model = Pricing::Discount.find(params[:pricing_discount_id])
+        @discount = DiscountViewModel.wrap(model, view_model_options)
+        @redemptions = model.redemptions.recent.page(params[:page])
+      end
+    end
+  end
+end

data/app/controllers/workarea/admin/pricing_overrides_controller.rb

@@ -1,7 +1,7 @@
 module Workarea
   module Admin
     class PricingOverridesController < Admin::ApplicationController
-      required_permissions :orders
+      required_permissions :orders_manager
 
       before_action :find_override
       before_action :find_order

data/app/controllers/workarea/admin/product_rules_controller.rb

@@ -54,7 +54,6 @@ module Workarea
 
       def destroy
         @product_rule.destroy
-
         flash[:success] = t('workarea.admin.product_rules.flash_messages.destroyed')
         redirect_back_or product_list_product_rules_path(@product_list.to_global_id)
       end
@@ -68,7 +67,7 @@ module Workarea
       end
 
       def find_product_rules
-        @product_rules = @product_list.product_rules.select(&:persisted?)
+        @product_rules = @product_list.product_rules.usable.select(&:persisted?)
       end
 
       def find_product_rule

data/app/controllers/workarea/admin/releases_controller.rb

@@ -6,14 +6,12 @@ module Workarea
       required_permissions :releases
 
       before_action :find_release, except: :changes
-      before_action :find_calendar, only: [:calendar, :update]
+      before_action :find_calendar, only: [:index, :update]
       before_action :authenticate_user_by_token, only: :calendar_feed
       skip_before_action :require_login, :require_admin, only: :calendar_feed
-      around_action :set_time_zone, only: :calendar
+      around_action :set_time_zone, only: :index
 
       def index
-        search = Search::AdminReleases.new(params)
-        @search = Admin::ReleaseSearchViewModel.new(search, view_model_options)
       end
 
       def show
@@ -28,7 +26,9 @@ module Workarea
         render json: { release: @release.model }
       end
 
-      def calendar
+      def list
+        search = Search::AdminReleases.new(params)
+        @search = Admin::ReleaseSearchViewModel.new(search, view_model_options)
       end
 
       def new
@@ -44,6 +44,9 @@ module Workarea
         end
       end
 
+      def original
+      end
+
       def publish
         self.current_release = nil
         PublishRelease.perform_async(@release.id)
@@ -52,14 +55,6 @@ module Workarea
         redirect_to return_to || release_path(@release)
       end
 
-      def undo
-        self.current_release = nil
-        @release.undo!
-
-        flash[:success] = t('workarea.admin.releases.flash_messages.reverted')
-        redirect_to return_to || release_path(@release)
-      end
-
       def destroy
         self.current_release = nil
         @release.destroy

data/app/controllers/workarea/admin/reports_controller.rb

@@ -29,6 +29,10 @@ module Workarea
       end
 
       def reference
+        @terms =
+          t('workarea.admin.reports.reference.terms')
+            .sort_by(&:first)
+            .map { |_key, term| OpenStruct.new(term) }
       end
 
       def sales_by_category
@@ -73,6 +77,13 @@ module Workarea
         )
       end
 
+      def sales_by_tender
+        @report = Reports::SalesByTenderViewModel.wrap(
+          Workarea::Reports::SalesByTender.new(params),
+          view_model_options
+        )
+      end
+
       def sales_over_time
         @report = Reports::SalesOverTimeViewModel.wrap(
           Workarea::Reports::SalesOverTime.new(params),
@@ -87,6 +98,13 @@ module Workarea
         )
       end
 
+      def timeline
+        @report = Reports::TimelineViewModel.wrap(
+          Workarea::Reports::SalesOverTime.new(params.merge(group_by: 'day')),
+          view_model_options
+        )
+      end
+
       def low_inventory
         @report = Reports::LowInventoryViewModel.wrap(
           Workarea::Reports::LowInventory.new(params),

data/app/controllers/workarea/admin/segment_overrides_controller.rb

@@ -0,0 +1,19 @@
+module Workarea
+  module Admin
+    class SegmentOverridesController < Admin::ApplicationController
+      def show
+      end
+
+      def create
+        segment_ids = params[:segment_ids].to_h.select { |_, v| v =~ /true/ }.keys
+        self.override_segments = Segment.in(id: segment_ids)
+
+        if params[:return_to].present?
+          redirect_to URI.parse(params[:return_to]).request_uri
+        else
+          redirect_back fallback_location: storefront.root_path
+        end
+      end
+    end
+  end
+end

data/app/controllers/workarea/admin/segment_rules_controller.rb

@@ -0,0 +1,62 @@
+module Workarea
+  module Admin
+    class SegmentRulesController < Admin::ApplicationController
+      before_action :find_segment, except: :geolocation_options
+      before_action :find_rules, except: :geolocation_options
+      before_action :find_rule, except: [:index, :geolocation_options]
+
+      def index
+      end
+
+      def geolocation_options
+        @results = Segment::Rules::GeolocationOption.search(params[:q])
+      end
+
+      def create
+        if @rule.save
+          flash[:success] = t('workarea.admin.segment_rules.flash_messages.saved')
+          redirect_to return_to || segment_rules_path(@segment)
+        else
+          flash[:error] = t('workarea.admin.segment_rules.flash_messages.error')
+          render :index, status: :unprocessable_entity
+        end
+      end
+
+      def update
+        if @rule.update_attributes(params[:rule])
+          flash[:success] = t('workarea.admin.segment_rules.flash_messages.saved')
+          redirect_to return_to || segment_rules_path(@segment)
+        else
+          flash[:error] = t('workarea.admin.segment_rules.flash_messages.error')
+          render :edit, status: :unprocessable_entity
+        end
+      end
+
+      def destroy
+        @rule.destroy
+        flash[:success] = t('workarea.admin.segment_rules.flash_messages.destroyed')
+        redirect_to return_to || segment_rules_path(@segment)
+      end
+
+      private
+
+      def find_segment
+        model = Segment.find(params[:segment_id])
+        @segment = SegmentViewModel.wrap(model, view_model_options)
+      end
+
+      def find_rules
+        @segment_rules = @segment.rules.select(&:persisted?)
+      end
+
+      def find_rule
+        @rule = if params[:id].present?
+          @segment.rules.where(id: params[:id]).first
+        else
+          klass = "Workarea::Segment::Rules::#{params[:rule_type].to_s.camelize}"
+          @segment.model.rules.build(params[:rule], klass.constantize)
+        end
+      end
+    end
+  end
+end