comable_backend 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0d5ce48da7e6b0b8a887a746cad4a75e4c31916
-  data.tar.gz: b22f25a4c7cbcdb0182651740c1736fcbb8aae04
+  metadata.gz: aa2786c8556acb44601370d90dedc34405b75fc4
+  data.tar.gz: 302afe2c02974bdba2d04c700165ca215a813cfa
 SHA512:
-  metadata.gz: 3da03ea18f27b7badb7c125d694f2ee471573f8a527edcb799618b88e3339ea65ef540f143dfccb452acae19a13476317ca2c563bcc80416aac0db0be12676f8
-  data.tar.gz: 24b68b045eb0abcc5ce41fafccb7d7cdfbeea15a7b9031e9812762e4e3410fe98f5403fe93a793739293863578f707939453eb499ae576df2b03d3f120a92d64
+  metadata.gz: 8b09ac7adc713fc6433722946eb45c60a6d9f6bd9eeca82cf7d93442c4f1200fa95bc519694157ca5ca37f2ef65e41df387499d6387339f5feced120b2679d79
+  data.tar.gz: f820fa64c10074668e0bd4c2b68fd34257bd373dc24b5052bfae1b6597d29c7b0552d3e2d324130fed9617eeb336e8c914eac1e3ada30c864a8ae5630612123b

data/app/assets/javascripts/comable/admin/application.coffee

@@ -92,6 +92,10 @@ $( ->
     $(window).on('resize', resize_comable_affix)
 
   $('[data-toggle="tooltip"]').tooltip()
+
+  $(document).on('change', '.btn-file :file', ->
+    $(this).closest('form').submit()
+  )
 )
 # Place all the behaviors and hooks related to the matching controller here.
 # All this logic will automatically be available in application.js.

data/app/assets/stylesheets/comable/admin/_common.scss

@@ -290,3 +290,26 @@ footer {
     color: #000;
   }
 }
+
+// for File Inputs
+// refs: http://www.abeautifulsite.net/whipping-file-inputs-into-shape-with-bootstrap-3/
+.btn-file {
+  position: relative;
+  overflow: hidden;
+  cursor: pointer;
+}
+
+.btn-file input[type=file] {
+  @include opacity(0);
+  position: absolute;
+  top: 0;
+  right: 0;
+  min-width: 100%;
+  min-height: 100%;
+  font-size: 100px;
+  text-align: right;
+  outline: none;
+  background: white;
+  cursor: inherit;
+  display: block;
+}

data/app/assets/stylesheets/comable/admin/_flow.scss

@@ -0,0 +1,149 @@
+// Variables
+$comable-flow-border: #eee;
+$comable-badge-size: 50px;
+$comable-badge-default-color: $gray;
+$comable-badge-default-bg: #fff;
+$comable-badge-default-border: $btn-default-border;
+$comable-badge-disable-color: #fff;
+$comable-badge-disable-bg: #ddd;
+$comable-badge-disable-border: $btn-default-border;
+$comable-badge-primary-color: $btn-primary-color;
+$comable-badge-primary-bg: $btn-primary-bg;
+$comable-badge-primary-border: $btn-primary-border;
+$comable-badge-success-color: $btn-success-color;
+$comable-badge-success-bg: $btn-success-bg;
+$comable-badge-success-border: $btn-success-border;
+$comable-badge-warning-color: $btn-warning-color;
+$comable-badge-warning-bg: $btn-warning-bg;
+$comable-badge-warning-border: $btn-warning-border;
+$comable-badge-danger-color: $btn-danger-color;
+$comable-badge-danger-bg: $btn-danger-bg;
+$comable-badge-danger-border: $btn-danger-border;
+
+// Mixins
+@mixin comable-badge($color, $background-color, $border-color) {
+  color: $color;
+  background-color: $background-color;
+  border-color: $border-color;
+
+  &:hover, &:focus {
+    color: $color;
+  }
+
+  @at-root a#{&}:hover, a#{&}:focus {
+    background-color: darken($background-color, 10%);
+    border-color: darken($border-color, 10%);
+  }
+}
+
+// Rules
+.comable-flow {
+  list-style: none;
+  margin-bottom: 20px;
+  padding: 20px 0;
+  position: relative;
+
+  &:before {
+    content: ' ';
+    margin-top: -1.5px;
+    height: 3px;
+    background-color: $comable-flow-border;
+    position: absolute;
+    top: 50%;
+    left: 0;
+    right: 0;
+  }
+
+  li {
+    @include inline-block;
+    margin-right: $comable-badge-size + 50px;
+    position: relative;
+  }
+}
+
+.comable-badge {
+  @include border-radius(50%);
+  margin-top: -($comable-badge-size / 2);
+  height: $comable-badge-size;
+  width: $comable-badge-size;
+  line-height: $comable-badge-size;
+  font-size: 1.4em;
+  text-align: center;
+  position: absolute;
+  left: 16px;
+  top: 50%;
+  z-index: 100;
+  border: 1px solid transparent;
+
+  &[disabled] {
+    @include opacity(0.65);
+    @include box-shadow(none);
+    cursor: not-allowed;
+    pointer-events: none;
+  }
+}
+
+.comable-badge-default {
+  @include comable-badge(
+    $color: $comable-badge-default-color,
+    $background-color: $comable-badge-default-bg,
+    $border-color: $comable-badge-default-border
+  );
+}
+
+.comable-badge-disable {
+  @include comable-badge(
+    $color: $comable-badge-disable-color,
+    $background-color: $comable-badge-disable-bg,
+    $border-color: $comable-badge-default-border
+  );
+}
+
+.comable-badge-primary {
+  @include comable-badge(
+    $color: $comable-badge-primary-color,
+    $background-color: $comable-badge-primary-bg,
+    $border-color: $comable-badge-primary-border
+  );
+}
+
+.comable-badge-success {
+  @include comable-badge(
+    $color: $comable-badge-success-color,
+    $background-color: $comable-badge-success-bg,
+    $border-color: $comable-badge-success-border
+  );
+}
+
+.comable-badge-danger {
+  @include comable-badge(
+    $color: $comable-badge-danger-color,
+    $background-color: $comable-badge-danger-bg,
+    $border-color: $comable-badge-danger-border
+  );
+}
+
+.comable-badge-warning {
+  @include comable-badge(
+    $color: $comable-badge-warning-color,
+    $background-color: $comable-badge-warning-bg,
+    $border-color: $comable-badge-warning-border
+  );
+}
+
+.comable-flow-label {
+  display: table;
+  height: $comable-badge-size + 5px;
+  margin: 0 0 0 auto;
+  text-align: right;
+}
+
+.comable-flow-label-container {
+  display: table-cell;
+  vertical-align: middle;
+
+  *:last-child {
+    margin-bottom: 0;
+    padding-bottom: 0;
+  }
+}

data/app/assets/stylesheets/comable/admin/application.scss

@@ -13,6 +13,7 @@
 @import 'comable/admin/mixins';
 @import 'comable/admin/overrides';
 @import 'comable/admin/common';
+@import 'comable/admin/flow';
 @import 'comable/admin/errors';
 @import 'comable/admin/dashboard';
 @import 'comable/admin/orders';

data/app/assets/stylesheets/comable/admin/overrides/bootstrap.scss

@@ -52,6 +52,7 @@ label {
 }
 
 select,
+textarea,
 input[type="password"],
 input[type="email"],
 input[type="text"] {

data/app/controllers/comable/admin/application_controller.rb

@@ -9,7 +9,19 @@ module Comable
       layout 'comable/admin/application'
 
       def current_ability
-        Comable::Ability.new(current_customer)
+        Comable::Ability.new(current_comable_user)
+      end
+
+      def respond_to_export_with(records)
+        respond_to do |format|
+          format.csv do
+            render csv: records, filename: filename
+          end
+
+          format.xlsx do
+            render xlsx: 'export', filename: filename, locals: { records: records }, template: 'comable/admin/shared/export', layout: false
+          end
+        end
       end
 
       private
@@ -17,22 +29,30 @@ module Comable
       rescue_from CanCan::AccessDenied, with: :unauthorized
 
       def unauthorized
-        if current_customer.signed_in?
+        if current_comable_user.signed_in?
           flash[:alert] = Comable.t('admin.access_denied')
           redirect_to after_access_denied_path
         else
           store_location
-          redirect_to comable.new_admin_customer_session_path
+          redirect_to comable.new_admin_user_session_path
         end
       end
 
       def after_access_denied_path
-        if current_customer.customer?
+        if current_comable_user.user?
           comable.root_path
         else
           comable.admin_root_path
         end
       end
+
+      def filename
+        "#{timestamp}_#{controller_name}"
+      end
+
+      def timestamp
+        Time.now.strftime('%Y%m%d%H%M%S')
+      end
     end
   end
 end

data/app/controllers/comable/admin/dashboard_controller.rb

@@ -10,10 +10,10 @@ module Comable
         authorize! :read, @this_month_orders
 
         # TODO: Comment out after adding timestamp columns
-        # @this_month_customers = Comable::Customer.with_role(:customer).this_month
-        # @this_week_customers = Comable::Customer.with_role(:customer).this_week
-        # @last_week_customers = Comable::Customer.with_role(:customer).last_week
-        # authorize! :read, @this_week_customers
+        # @this_month_users = Comable::User.with_role(:user).this_month
+        # @this_week_users = Comable::User.with_role(:user).this_week
+        # @last_week_users = Comable::User.with_role(:user).last_week
+        # authorize! :read, @this_week_users
       end
     end
   end

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

@@ -3,15 +3,96 @@ require_dependency 'comable/admin/application_controller'
 module Comable
   module Admin
     class OrdersController < Comable::Admin::ApplicationController
+      include Comable::PermittedAttributes
+
       load_and_authorize_resource class: Comable::Order.name, except: :index
 
       def index
         @q = Comable::Order.complete.ransack(params[:q])
-        @orders = @q.result.page(params[:page]).per(15).order('completed_at DESC').accessible_by(current_ability)
+        @orders = @q.result.page(params[:page]).per(15).recent.accessible_by(current_ability)
       end
 
       def show
       end
+
+      def edit
+      end
+
+      def update
+        if @order.update_attributes(order_params)
+          redirect_to comable.admin_order_path(@order), notice: Comable.t('successful')
+        else
+          flash.now[:alert] = Comable.t('failure')
+          render :edit
+        end
+      end
+
+      def export
+        q = Comable::Order.complete.ransack(params[:q])
+        orders = q.result.recent.accessible_by(current_ability)
+        order_items = Comable::OrderItem.joins(:order).merge(orders)
+
+        respond_to_export_with order_items
+      end
+
+      def cancel
+        @order.cancel!
+        redirect_to :back, notice: Comable.t('successful')
+      rescue ActiveRecord::RecordInvalid => e
+        redirect_to :back, alert: e.message
+      end
+
+      def resume
+        @order.resume!
+        redirect_to :back, notice: Comable.t('successful')
+      rescue ActiveRecord::RecordInvalid => e
+        redirect_to :back, alert: e.message
+      end
+
+      def cancel_payment
+        @order.payment.cancel!
+        redirect_to :back, notice: Comable.t('successful')
+      rescue ActiveRecord::RecordInvalid => e
+        redirect_to :back, alert: e.message
+      end
+
+      def resume_payment
+        @order.payment.resume!
+        redirect_to :back, notice: Comable.t('successful')
+      rescue ActiveRecord::RecordInvalid => e
+        redirect_to :back, alert: e.message
+      end
+
+      def ship
+        @order.shipment.ship!
+        redirect_to :back, notice: Comable.t('successful')
+      rescue ActiveRecord::RecordInvalid => e
+        redirect_to :back, alert: e.message
+      end
+
+      def cancel_shipment
+        @order.shipment.cancel!
+        redirect_to :back, notice: Comable.t('successful')
+      rescue ActiveRecord::RecordInvalid => e
+        redirect_to :back, alert: e.message
+      end
+
+      def resume_shipment
+        @order.shipment.resume!
+        redirect_to :back, notice: Comable.t('successful')
+      rescue ActiveRecord::RecordInvalid => e
+        redirect_to :back, alert: e.message
+      end
+
+      private
+
+      def order_params
+        params.require(:order).permit(
+          :email,
+          bill_address_attributes: permitted_address_attributes,
+          ship_address_attributes: permitted_address_attributes
+        )
+      end
     end
   end
 end

data/app/controllers/comable/admin/payment_methods_controller.rb

@@ -49,6 +49,7 @@ module Comable
           :name,
           :payment_provider_type,
           :payment_provider_kind,
+          :fee,
           :enable_price_from,
           :enable_price_to
         )

data/app/controllers/comable/admin/products_controller.rb

@@ -47,6 +47,22 @@ module Comable
         end
       end
 
+      def export
+        q = Comable::Product.ransack(params[:q])
+        products = q.result.accessible_by(current_ability)
+
+        respond_to_export_with products
+      end
+
+      def import
+        ActiveRecord::Base.transaction do
+          Comable::Product.import_from(params[:file])
+        end
+        redirect_to comable.admin_products_path, notice: Comable.t('successful')
+      rescue Comable::Importable::Exception => e
+        redirect_to comable.admin_products_path, alert: e.message
+      end
+
       private
 
       def product_params

data/app/controllers/comable/admin/stocks_controller.rb

@@ -50,6 +50,22 @@ module Comable
         end
       end
 
+      def export
+        q = @stocks.ransack(params[:q])
+        stocks = q.result.includes(:product).accessible_by(current_ability)
+
+        respond_to_export_with stocks
+      end
+
+      def import
+        ActiveRecord::Base.transaction do
+          Comable::Stock.import_from(params[:file])
+        end
+        redirect_to comable.admin_stocks_path, notice: Comable.t('successful')
+      rescue Comable::Importable::Exception => e
+        redirect_to comable.admin_stocks_path, alert: e.message
+      end
+
       private
 
       def stock_params