deal_redemptions 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 381dc98f7c647f4aff7871865ab7f994fdfb7cc5
-  data.tar.gz: f7a05a51e13ffdd9fb2e01ea5b55eba95d5745d5
+  metadata.gz: fa79c20901b82ad1ece7615c38436ec366691059
+  data.tar.gz: 21d77a4b1aca8f9c5ba4255d307f1f05f6e78533
 SHA512:
-  metadata.gz: acee070426e553537996a592b6e388fa7c48feed5f3666123da8f9dbbd8d663620d25cf196cb503f6e2cbae247e8d959855baaa542e7ed20929fff2fa05db8de
-  data.tar.gz: 05938303b452f8a14315dbe3e2822a9ff48f9b8d20c7144b8010b04d1880ab6edea753de0d160f8060b75db81934609e3d37d6901bde528772899a53244bc5df
+  metadata.gz: 6035d4040643b51a627ecf86a08825247f071e4474e2a85b6eb2d12e173b8bf184beebfcf25d417a4eea1cd8dc50ded52537add967b148d8d36f1382f1eb7c3e
+  data.tar.gz: a8b1cf5705378a0844e7b2ddf736477998d19ca6e7e6debe6fe05c585c557e1a402ca71e9e59d4462900e63b9e316aef5f8e8973b1c812b0d262d378594091e0

data/app/assets/javascripts/deal_redemptions/admin.js.coffee

@@ -32,9 +32,14 @@ class Navigation
     $('section#mobile-navigation select').bind 'change', () ->
       window.location.href = @.value
 
+class RedeemCode
+  generate_slug: (string) ->
+    string.replace(/\W+/g, '-').toLowerCase()
+
 
 $(document).ready ->
   navigation = new Navigation
+  redeem_code = new RedeemCode
 
   # Responsive mobile navigation
   navigation.mobile()
@@ -74,4 +79,10 @@ $(document).ready ->
 
   }).on('changeDate', (ev) ->
     checkout.hide()
-  ).data('datepicker')
+  ).data('datepicker')
+
+  # Generate company slug
+  $('input#company_name').keyup(() ->
+    slug = $('input#company_slug')
+    slug.val(redeem_code.generate_slug(@.value))
+  )

data/app/controllers/deal_redemptions/admin/redeem_codes_controller.rb

@@ -0,0 +1,107 @@
+require_dependency "deal_redemptions/application_controller"
+
+module DealRedemptions
+  class Admin::RedeemCodesController < ApplicationController
+    layout 'deal_redemptions/admin/default'
+
+    before_action :admin_authorize
+    before_action :set_admin_redeem_code, only: [:edit, :update, :destroy]
+    before_action :check_existing_company_code, only: [:update, :create]
+
+    # GET /admin/redeem_codes
+    def index
+      # Check if search param is present
+      if params[:search].blank?
+        @admin_redeem_codes = DealRedemptions::RedeemCode.page(params[:page]).order(:code).includes(:company)
+      else
+        query = DealRedemptions::Redemption.find_by_sql(build_search_query)
+        @admin_redeem_codes = Kaminari.paginate_array(query).page(params[:page])
+      end
+    end
+
+    # GET /admin/redeem_codes/new
+    def new
+      @admin_redeem_code = DealRedemptions::RedeemCode.new
+    end
+
+    # GET /admin/redeem_codes/1/edit
+    def edit
+    end
+
+    # POST /admin/redeem_codes
+    def create
+      @admin_redeem_code = DealRedemptions::RedeemCode.new(redeem_code_params)
+
+      if @existing_code.count > 0
+        flash[:notice] = 'Redemption code already exists.'
+        render :new
+      else
+        if @admin_redeem_code.save
+          redirect_to admin_redeem_codes_path, notice: 'Redeem code was successfully created.'
+        else
+          render :new
+        end
+      end
+    end
+
+    # PATCH/PUT /admin/redeem_codes/1
+    def update
+      if @existing_code.count > 0
+        flash[:notice] = 'Redemption code already exists.'
+        render :edit
+      else
+        if @admin_redeem_code.update(redeem_code_params)
+          redirect_to admin_redeem_codes_path, notice: 'Redeem code was successfully updated.'
+        else
+          render :edit
+        end
+      end
+    end
+
+    # DELETE /admin/redeem_codes/1
+    def destroy
+      @admin_redeem_code.destroy
+      redirect_to admin_redeem_codes_url, notice: 'Redeem code was successfully destroyed.'
+    end
+
+    private
+      # Use callbacks to share common setup or constraints between actions.
+      def set_admin_redeem_code
+        @admin_redeem_code = DealRedemptions::RedeemCode.find(params[:id])
+      end
+
+      # Check existing redemption code by company
+      def check_existing_company_code
+        redeem_code = params[:redeem_code]
+        @existing_code = DealRedemptions::RedeemCode.find_code_and_company(redeem_code[:code], redeem_code[:company_id])
+      end
+
+      # Search redemption codes
+      def build_search_query
+        string = params[:search].split ' '
+        redeem_codes = DealRedemptions::RedeemCode.arel_table
+        companies = DealRedemptions::Company.arel_table
+        query = redeem_codes.project(
+          redeem_codes[:id],
+          redeem_codes[:company_id],
+          redeem_codes[:code],
+          redeem_codes[:status],
+          redeem_codes[:created_at]
+        )
+        .join(companies)
+        .on(redeem_codes[:company_id]
+            .eq(companies[:id]))
+
+        string.each do |s|
+          query.where(redeem_codes[:code].matches("%#{s}%"))
+        end
+
+        query.to_sql
+      end
+
+      # Only allow a trusted parameter "white list" through.
+      def redeem_code_params
+        params.require(:redeem_code).permit(:company_id, :product_id, :code, :status)
+      end
+  end
+end

data/app/models/deal_redemptions/redeem_code.rb

@@ -26,5 +26,10 @@ module DealRedemptions
     def self.by_company(company)
       where(company_id: company)
     end
+
+    # Find code and company
+    def self.find_code_and_company(code, company)
+      where("code = ? AND company_id = ?", code, company)
+    end
   end
 end

data/app/views/deal_redemptions/admin/redeem_codes/_form.html.haml

@@ -0,0 +1,22 @@
+- if @admin_redeem_code.errors.any?
+  .alert.alert-danger
+    %ul
+    - @admin_redeem_code.errors.full_messages.each do |msg|
+      %li
+        = msg
+
+= form_for [:admin, @admin_redeem_code] do |f|
+  .form-group
+    = f.label :code
+    = f.text_field :code, class: 'form-control'
+  .form-group
+    = f.label :company_id, 'Company'
+    = f.select :company_id, DealRedemptions::Company.all_by_name.collect {|c| [c.name, c.id]}, {}, { class: 'form-control' }
+  .form-group
+    = f.label :product_id, 'Product'
+    = f.select :product_id, DealRedemptions::Product.all.collect {|p| [p.name, p.id]}, {}, { class: 'form-control' }
+  .form-group
+    = f.label :status
+    = f.select :status, [:active, :redeemed, :void], {}, { class: 'form-control' }
+  .form-group.pull-right
+    = f.submit @admin_redeem_code.new_record? ? "Create Code" : "Edit Code", class: 'btn btn-primary'

data/app/views/deal_redemptions/admin/redeem_codes/edit.html.haml

@@ -0,0 +1,22 @@
+- page_title "Redemption Code"
+- admin_page_title "<i class=\"redemptions\"></i> #{link_to 'Redemption Codes', admin_redeem_code_path} / #{@admin_redeem_code.code}".html_safe
+
+.row
+  .col-md-4
+    %h3 Edit existing redemption code
+    Make modifications to an existing redemption code.
+    %hr
+
+    - unless @admin_redeem_code.redemption_id.blank?
+      %h4 This code has been used.
+      = link_to 'View Redemption', admin_redemption_path(@admin_redeem_code.redemption_id)
+      %hr
+
+    %h4 Want to remove this code?
+    %h5 Click the button below. You can <strong>NOT</strong> undo this action.
+
+    = button_to 'Delete Redeem Code', admin_redeem_code_path, method: :delete, name: nil, class: 'btn btn-danger', onclick: 'if(!confirm("Are you sure you want to delete this redemption code?")) return false;'
+    %hr
+
+  .col-md-8
+    = render 'form'

data/app/views/deal_redemptions/admin/redeem_codes/index.html.haml

@@ -0,0 +1,55 @@
+- page_title 'Redemption Codes'
+- admin_page_title '<i class="redemptions"></i> Redemption Codes'.html_safe
+
+%hr
+  .row.clearfix
+    .col-md-4
+      = form_tag '', method: 'get', class: 'search-redemptions pull-right' do
+        .col-md-8.padding-right-5
+          .form-group
+            = search_field_tag '', '', name: 'search', class: 'form-control', placeholder: 'Search by code:'
+        .col-md-4.padding-left-5
+          .form-group
+            = button_tag 'Search', name: nil, class: 'btn btn-primary'
+    .col-md-8
+%hr
+
+- if @admin_redeem_codes.empty?
+
+  .no-current-redemptions
+    %i.redemptions.clearfix
+    No redemption codes were found
+
+- else
+  .row
+    .col-md-12
+      = link_to 'New Code', new_admin_redeem_code_path, class: 'btn btn-primary pull-right'
+  %hr
+
+  = paginate @admin_redeem_codes
+
+  %table{id: 'redemptions', class: 'table default'}
+    %thead
+      %tr
+        %td
+          Code
+        %td
+          Company:
+        %td
+          Status:
+        %td
+          Created:
+    %tbody
+    - @admin_redeem_codes.each do |code|
+      %tr
+        %td
+          = link_to "#{code.code}", edit_admin_redeem_code_path(code.id)
+        %td
+          = code.company.name
+        %td
+          = code.status
+        %td
+          = code.created_at
+
+  .row-fluid
+    = paginate @admin_redeem_codes

data/app/views/deal_redemptions/admin/redeem_codes/new.html.haml

@@ -0,0 +1,11 @@
+- page_title "New Redemption Code"
+- admin_page_title "<i class=\"redemptions\"></i> #{link_to 'Redeem Codes', admin_redeem_codes_path} / New Redeem Code".html_safe
+
+.row
+  .col-md-4
+    %h3 New redemption code
+    Add new deal site redemption code.
+    %hr
+
+  .col-md-8
+    = render 'form'

data/app/views/deal_redemptions/admin/shared/_sidebar.html.haml

@@ -10,6 +10,8 @@
         = admin_link_to('<i class="products"></i> Products'.html_safe, admin_products_path, {class: 'sidebar-link'})
       %li
         = admin_link_to('<i class="companies"></i> Companies'.html_safe, admin_companies_path, {class: 'sidebar-link'})
+      %li
+        = admin_link_to('<i class="redemptions"></i> Redeem Codes'.html_safe, admin_redeem_codes_path, {class: 'sidebar-link'})
       %li
         = admin_link_to('<i class="import"></i> Import/Export'.html_safe, admin_import_path, {class: 'sidebar-link'})
       %li

data/app/views/kaminari/_gap.html.haml

@@ -5,4 +5,4 @@
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
 %li.page.gap
-  = t('views.pagination.truncate').html_safe
+  =# t('views.pagination.truncate').html_safe

data/app/views/layouts/deal_redemptions/admin/default.html.erb

@@ -36,6 +36,7 @@
           <option value="<%= admin_redemptions_path %>">Redemptions</option>
           <option value="<%= admin_products_path %>">Products</option>
           <option value="<%= admin_companies_path %>">Companies</option>
+          <option value="<%= admin_redeem_codes_path %>">Redeem Codes</option>
           <option value="<%= admin_import_path %>">Import/Export</option>
           <option value="<%= admin_settings_path %>">Settings</option>
         </select>

data/config/routes.rb

@@ -33,6 +33,7 @@ DealRedemptions::Engine.routes.draw do
     resources :companies
     resources :redemptions
     resources :products, except: [:show]
+    resources :redeem_codes, except: [:show]
     resources :sessions
   end
 end

data/lib/deal_redemptions/version.rb

@@ -1,3 +1,3 @@
 module DealRedemptions
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/spec/controllers/deal_redemptions/admin/redeem_codes_controller_spec.rb

@@ -0,0 +1,143 @@
+require 'rails_helper'
+
+module DealRedemptions
+  RSpec.describe Admin::RedeemCodesController, :type => :controller do
+    routes { DealRedemptions::Engine::routes }
+
+    # This should return the minimal set of attributes required to create a valid
+    # Admin::RedeemCode. As you add validations to Admin::RedeemCode, be sure to
+    # adjust the attributes here as well.
+    let(:valid_attributes) {
+      FactoryGirl.attributes_for(:redeem_code)
+    }
+
+    let(:invalid_attributes) {
+      FactoryGirl.attributes_for(:redeem_code, code: '')
+    }
+
+    # This should return the minimal set of values that should be in the session
+    # in order to pass any filters (e.g. authentication) defined in
+    # Admin::RedeemCodesController. Be sure to keep this updated too.
+    let(:valid_session) {
+      {admin_user_id: 1}
+    }
+
+    before :each do
+      FactoryGirl.create(:user, id: 1)
+
+      # Mock call to check for existing redemption code on create or update
+      allow(DealRedemptions::RedeemCode).to receive(:find_code_by_company).and_return([])
+    end
+
+    describe "GET index" do
+      it "assigns all admin_redeem_codes as @admin_redeem_codes" do
+        redeem_code = FactoryGirl.create(:redeem_code)
+        get :index, {}, valid_session
+        expect(assigns(:admin_redeem_codes)).to eq([redeem_code])
+      end
+    end
+
+    describe "GET new" do
+      it "assigns a new admin_redeem_code as @admin_redeem_code" do
+        get :new, {}, valid_session
+        expect(assigns(:admin_redeem_code)).to be_a_new(DealRedemptions::RedeemCode)
+      end
+    end
+
+    describe "GET edit" do
+      it "assigns the requested admin_redeem_code as @admin_redeem_code" do
+        redeem_code = FactoryGirl.create(:redeem_code)
+        get :edit, {:id => redeem_code.to_param}, valid_session
+        expect(assigns(:admin_redeem_code)).to eq(redeem_code)
+      end
+    end
+
+    describe "POST create" do
+      describe "with valid params" do
+        it "creates a new Admin::RedeemCode" do
+          expect {
+            post :create, {:redeem_code => valid_attributes}, valid_session
+          }.to change(DealRedemptions::RedeemCode, :count).by(1)
+        end
+
+        it "assigns a newly created admin_redeem_code as @admin_redeem_code" do
+          post :create, {:redeem_code => valid_attributes}, valid_session
+          expect(assigns(:admin_redeem_code)).to be_a(DealRedemptions::RedeemCode)
+          expect(assigns(:admin_redeem_code)).to be_persisted
+        end
+
+        it "redirects to the admin_redeem_codes" do
+          post :create, {:redeem_code => valid_attributes}, valid_session
+          expect(response).to redirect_to(admin_redeem_codes_path)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved admin_redeem_code as @admin_redeem_code" do
+          post :create, {:redeem_code => invalid_attributes}, valid_session
+          expect(assigns(:admin_redeem_code)).to be_a_new(DealRedemptions::RedeemCode)
+        end
+
+        it "re-renders the 'new' template" do
+          post :create, {:redeem_code => invalid_attributes}, valid_session
+          expect(response).to render_template("new")
+        end
+      end
+    end
+
+    describe "PUT update" do
+      describe "with valid params" do
+        let(:new_attributes) {
+          { redeem_code: FactoryGirl.attributes_for(:redeem_code) }
+        }
+
+        before :each do
+          @redeem_code = FactoryGirl.create(:redeem_code)
+          put :update, {:id => @redeem_code.to_param, :redeem_code => valid_attributes}, valid_session
+        end
+
+        it "updates the requested admin_redeem_code" do
+          @redeem_code.reload
+          expect(@redeem_code.id).to eq(1)
+        end
+
+        it "assigns the requested admin_redeem_code as @admin_redeem_code" do
+          expect(assigns(:admin_redeem_code)).to eq(@redeem_code)
+        end
+      end
+
+      describe "with invalid params" do
+        before :each do
+          @redeem_code = FactoryGirl.create(:redeem_code)
+          put :update, {:id => @redeem_code.to_param, :redeem_code => invalid_attributes}, valid_session
+        end
+
+        it "assigns the admin_redeem_code as @admin_redeem_code" do
+          expect(assigns(:admin_redeem_code)).to eq(@redeem_code)
+        end
+
+        it "re-renders the 'edit' template" do
+          expect(response).to render_template("edit")
+        end
+      end
+    end
+
+    describe "DELETE destroy" do
+      before :each do
+        @redeem_code = FactoryGirl.create(:redeem_code)
+      end
+
+      it "destroys the requested admin_redeem_code" do
+        expect {
+          delete :destroy, {:id => @redeem_code.to_param}, valid_session
+        }.to change(DealRedemptions::RedeemCode, :count).by(-1)
+      end
+
+      it "redirects to the admin_redeem_codes list" do
+        delete :destroy, {:id => @redeem_code.to_param}, valid_session
+        expect(response).to redirect_to(admin_redeem_codes_url)
+      end
+    end
+
+  end
+end