tienda 1.1.2 → 2.0.1

data/app/assets/stylesheets/tienda/custom-styles.scss

@@ -0,0 +1,518 @@
+/*----------------------------------------------
+Author : www.webthemez.com
+License: Commons Attribution 3.0
+http://creativecommons.org/licenses/by/3.0/
+------------------------------------------------*/
+
+
+/*----------------------------------------------
+    COMMON  STYLES
+------------------------------------------------*/
+body {
+    font-family: 'Open Sans', sans-serif;
+}
+
+ #wrapper {
+    width: 100%;
+    background:#09192A;
+}
+
+#page-wrapper {
+    padding: 15px 15px;
+    min-height: 600px;
+    background:#E5EBF2;
+
+}
+#page-inner {
+    width:100%;
+    margin:10px 20px 10px 0px;
+    background-color:transparent;
+    padding:10px;
+    min-height:1200px;
+}
+
+.text-center {
+    text-align:center;
+}
+.no-boder {
+    border:1px solid #f3f3f3;
+}
+
+h1, .h1, h2, .h2, h3, .h3 {
+margin-top: 7px;
+margin-bottom: -5px;
+}
+h2 {
+    color: #000;
+}
+h4 {
+    padding-top:10px;
+}
+.square-btn-adjust {
+    border: 0px solid transparent;
+   -webkit-border-radius: 0px;
+-moz-border-radius: 0px;
+border-radius: 0px;
+
+}
+p {
+    font-size:16px;
+    line-height:25px;
+    padding-top:20px;
+}
+/*----------------------------------------------
+   DASHBOARD STYLES
+------------------------------------------------*/
+.page-header {
+padding-bottom: 9px;
+margin: 10px 0 45px;
+border-bottom: 1px solid #C7D1DD;
+}
+.panel-back {
+    background-color:#fff;
+
+}
+.panel-default > .panel-heading {
+color: #000;
+background-color: #FFFFFF;
+border-color: #ddd;
+font-weight:bold;
+}
+.jumbotron, .well{
+background:#fff;
+}
+   .noti-box {
+min-height: 100px;
+padding: 20px;
+}
+
+    .noti-box .icon-box {
+display: block;
+float: left;
+margin: 0 15px 10px 0;
+width: 70px;
+height: 70px;
+line-height: 75px;
+vertical-align: middle;
+text-align: center;
+font-size: 40px;
+}
+.text-box p{
+    margin: 0 0 3px;
+}
+.main-text {
+    font-size: 25px;
+    font-weight:600;
+}
+.set-icon {
+-webkit-border-radius: 50px;
+-moz-border-radius: 50px;
+border-radius: 50px;
+
+}
+    .bg-color-green {
+background-color: #fff;
+color: #5cb85c;
+}
+ .bg-color-blue {
+background-color: #fff;
+color: #4CB1CF
+}
+  .bg-color-red {
+background-color: #fff;
+color:#F0433D;
+}
+  .bg-color-brown {
+background-color: #fff;
+color:#f0ad4e;
+}
+.back-footer-green {
+background-color: #5cb85c;
+color:#fff;
+border-top: 0px solid #fff;
+}
+ .back-footer-red {
+background-color: #F0433D;
+color:#fff;
+border-top: 0px solid #fff;
+}
+ .back-footer-blue {
+background-color: #4CB1CF;
+color:#fff;
+border-top: 0px solid #fff;
+}
+ .back-footer-brown {
+background-color: #f0ad4e;
+color:#fff;
+border-top: 0px solid #fff;
+}
+ .icon-box-right {
+display: block;
+float: right;
+margin: 0 15px 10px 0;
+width: 70px;
+height: 70px;
+line-height: 75px;
+vertical-align: middle;
+text-align: center;
+font-size: 40px;
+}
+
+ .main-temp-back {
+background: #8702A8;
+color: #FFFFFF;
+font-size: 16px;
+font-weight: 300;
+text-align: center;
+}
+ .main-temp-back .text-temp {
+font-size: 40px;
+}
+.back-dash {
+    padding:20px;
+    font-size:20px;
+    font-weight:500;
+  -webkit-border-radius: 0px;
+-moz-border-radius: 0px;
+border-radius: 0px;
+background-color:#2EA7EB;
+color:#fff;
+}
+    .back-dash p {
+        padding-top:16px;
+        font-size:13px;
+        color:#fff;
+        line-height:25px;
+        text-align:justify;
+    }
+
+     .color-bottom-txt {
+   color: #000;
+font-size: 16px;
+line-height: 30px;
+}
+     /*CHAT PANEL*/
+ .chat-panel .panel-body {
+height: 450px;
+overflow-y: scroll;
+}
+ .chat-box {
+margin: 0;
+padding: 0;
+list-style: none;
+}
+ .chat-box li {
+margin-bottom: 15px;
+padding-bottom: 5px;
+border-bottom: 1px dotted #808080;
+}
+ .chat-box li.left .chat-body {
+margin-left: 90px;
+}
+ .chat-box li .chat-body p {
+margin: 0;
+color: #8d8888;
+}
+.chat-img>img {
+    margin-left:20px;
+}
+footer p{
+font-size: 14px;
+}
+/*----------------------------------------------
+    MENU STYLES
+------------------------------------------------*/
+
+
+.user-image {
+    margin: 25px auto;
+-webkit-border-radius: 10px;
+-moz-border-radius: 10px;
+border-radius: 10px;
+max-height:170px;
+max-width:170px;
+}
+.top-navbar{
+margin:0px;
+}
+.top-navbar .navbar-brand {
+color: #fff;
+width: 260px;
+text-align: left;
+height: 60px;
+font-size: 30px;
+font-weight: 700;
+text-transform: uppercase;
+line-height: 30px;
+}
+.top-navbar .nav > li {
+position: relative;
+display: inline-block;
+}
+.top-navbar .nav > li > a {
+position: relative;
+display: block;
+padding: 19px 15px;
+color: #77C0FD;
+}
+.top-navbar .nav > li > a:hover, .top-navbar .nav > li > a:focus {
+text-decoration: none;
+background-color: #225081;
+color: #fff;
+}
+.top-navbar .dropdown-menu{
+min-width: 230px;
+border-radius: 0 0 4px 4px;
+}
+.top-navbar .dropdown-menu > li > a:hover, .top-navbar .dropdown-menu > li > a:focus{
+color: #225081;
+background:none;
+}
+.dropdown-tasks{
+width: 255px;
+}
+.dropdown-tasks .progress {
+height: 8px;
+margin-bottom: 8px;
+overflow: hidden;
+background-color: #f5f5f5;
+border-radius: 0px;
+}
+.dropdown-tasks > li > a {
+padding: 0px 15px;
+}
+.dropdown-tasks p {
+font-size: 13px;
+line-height: 21px;
+padding-top: 4px;
+}
+.active-menu {
+    background-color:#225081!important;
+}
+
+.arrow {
+    float: right;
+}
+
+.fa.arrow:before {
+    content: "\f104";
+}
+
+.active > a > .fa.arrow:before {
+    content: "\f107";
+}
+
+
+.nav-second-level li,
+.nav-third-level li {
+    border-bottom: none !important;
+}
+
+.nav-second-level li a {
+    padding-left: 37px;
+}
+
+.nav-third-level li a {
+    padding-left: 55px;
+}
+.sidebar-collapse , .sidebar-collapse .nav{
+	background:none;
+}
+.sidebar-collapse .nav {
+	padding:0;
+}
+.sidebar-collapse .nav > li > a {
+	color:#fff;
+	background:transparent;
+	text-shadow:none;
+
+}
+.sidebar-collapse > .nav > li > a {
+	padding:15px 10px;
+}
+.sidebar-collapse > .nav > li {
+	border-bottom: 1px solid rgba(107, 108, 109, 0.19);
+}
+ul.nav.nav-second-level.collapse.in {
+background: #172D44;
+}
+.sidebar-collapse .nav > li > a:hover,
+.sidebar-collapse .nav > li > a:focus {
+
+	outline:0;
+}
+
+.navbar-side {
+	border:none;
+	background-color: transparent;
+
+}
+.top-navbar {
+	background:#09192A;
+	border-bottom:none;
+
+}
+.top-navbar .nav > li > a > i {
+margin-right: 2px;
+}
+.top-navbar .navbar-brand:hover {
+color:#fff;
+
+}
+.dropdown-user li {
+margin: 8px 0;
+}
+.navbar-default {
+border:0px solid black;
+
+}
+.navbar-header {
+    background: #09192A;
+}
+.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
+background-color: #B40101;
+}
+.navbar-default .navbar-toggle {
+border-color: #fff;
+}
+
+.navbar-default .navbar-toggle .icon-bar {
+background-color: #FFF;
+}
+.nav > li > a > i {
+    margin-right:10px;
+}
+/*----------------------------------------------
+    UI ELEMENTS STYLES
+------------------------------------------------*/
+.btn-circle {
+width: 50px;
+height: 50px;
+padding: 6px 0;
+ -webkit-border-radius: 25px;
+-moz-border-radius: 25px;
+border-radius: 25px;
+text-align: center;
+font-size: 12px;
+line-height: 1.428571429;
+}
+
+/*----------------------------------------------
+   MODAL STYLES
+------------------------------------------------*/
+
+#stockModal .modal-dialog {
+  width: 75%;
+}
+
+/*----------------------------------------------
+   PRODUCT STYLES
+------------------------------------------------*/
+
+.productAttributes td.handle {
+  background: image-url('tienda/move.svg') no-repeat center;
+  background-size: 16px
+}
+
+/*----------------------------------------------
+   ORDER STATUS STYLES
+------------------------------------------------*/
+
+.status-bar {
+  background: image-url("tienda/square.svg") repeat-x 0 15px;
+  background-size: 8px;
+  margin: 45px 0;
+  overflow: hidden;
+}
+
+.status-bar ul {
+  list-style: none;
+}
+
+.status-bar ul li {
+  width: 33%;
+  float: left;
+  text-align: center;
+  background: image-url("tienda/statuses/shipped.svg") no-repeat center 0;
+  background-size: 36px;
+  padding-top: 42px;
+  z-index: 10;
+}
+
+.status-bar ul h4 {
+  color: #E32479;
+}
+
+.status-bar ul li p {
+  margin-top: 5px;
+  font-size: 0.9em;
+  color: #999;
+}
+
+.status-bar ul li a {
+  color: inherit;
+}
+
+.status-bar ul li.payment {
+  background-image: image-url("tienda/statuses/paid.svg");
+}
+
+.status-bar ul li.payment h4 {
+  color: #3DB3E2;
+}
+
+.status-bar ul li.received {
+  background-image: image-url("tienda/statuses/received.svg");
+}
+
+.status-bar ul li.received h4 {
+  color: #909091;
+}
+
+.status-bar ul li.accepted {
+  background-image: image-url("tienda/statuses/accepted.svg");
+}
+
+.status-bar ul li.accepted h4 {
+  color: #89BD2F;
+}
+
+.status-bar ul li.rejected {
+  background-image: image-url("tienda/statuses/rejected.svg");
+}
+
+.status-bar ul li.rejected h4 {
+  color: #E33127;
+}
+
+/*----------------------------------------------
+    MEDIA QUERIES
+------------------------------------------------*/
+
+ @media(min-width:768px) {
+     #page-wrapper{
+               margin: 0 0 0 260px;
+        padding: 15px 30px;
+        min-height: 1200px;
+
+    }
+
+
+    .navbar-side {
+        z-index: 1;
+        position: absolute;
+        width: 260px;
+    }
+
+   .navbar {
+ border-radius: 0px;
+}
+
+}
+ @media(max-width:480px) {
+.page-header small {
+display: block;
+padding-top: 14px;
+font-size: 19px;
+}
+}

data/app/assets/stylesheets/tienda/morris-0.4.3.min.css

@@ -0,0 +1,2 @@
+.morris-hover{position:absolute;z-index:1000;}.morris-hover.morris-default-style{border-radius:10px;padding:6px;color:#666;background:rgba(255, 255, 255, 0.8);border:solid 2px rgba(230, 230, 230, 0.8);font-family:sans-serif;font-size:12px;text-align:center;}.morris-hover.morris-default-style .morris-hover-row-label{font-weight:bold;margin:0.25em 0;}
+.morris-hover.morris-default-style .morris-hover-point{white-space:nowrap;margin:0.1em 0;}

data/app/controllers/tienda/dashboard_controller.rb

@@ -1,8 +1,18 @@
 module Tienda
   class DashboardController < Tienda::ApplicationController
 
+    before_filter { @active_nav = :root }
+
     def home
-      redirect_to :orders
+      @last_30_days_orders = {}
+      end_date = Date.today
+      start_date = end_date - 30.days
+      last_30_days_orders = Tienda::Order.group('DATE(created_at)').where(created_at: start_date..end_date).count
+      (start_date..end_date).each do |day|
+        @last_30_days_orders[day] = last_30_days_orders[day] || 0
+      end
+      @sales_by_category = Tienda::Order.joins(products: [:product_category]).where(created_at: start_date..end_date).group('tienda_product_categories.name').count
+      @users_count = Tienda::User.count
     end
 
   end

data/app/controllers/tienda/products_controller.rb

@@ -5,7 +5,11 @@ module Tienda
     before_filter { params[:id] && @product = Tienda::Product.root.find(params[:id]) }
 
     def index
-      @products = Tienda::Product.root.includes(:stock_level_adjustments, :default_image, :product_category, :variants).order(:name).group_by(&:product_category).sort_by { |cat,pro| cat.name }
+      if params[:filter].blank?
+        @products = Tienda::Product.root.includes(:stock_level_adjustments, :default_image, :product_category, :variants).order(:name).group_by(&:product_category).sort_by { |cat, pro| cat.name }
+      else
+        @products = Tienda::Product.root.send(params[:filter]).includes(:stock_level_adjustments, :default_image, :product_category, :variants).order(:name).group_by(&:product_category).sort_by { |cat, pro| cat.name }
+      end
     end
 
     def new
@@ -17,7 +21,7 @@ module Tienda
       if @product.save
         redirect_to :products, flash: { notice: t('tienda.products.create_notice') }
       else
-        render action: "new"
+        render :new
       end
     end
 
@@ -28,7 +32,7 @@ module Tienda
       if @product.update(safe_params)
         redirect_to [:edit, @product], flash: { notice: t('tienda.products.update_notice') }
       else
-        render action: "edit"
+        render :edit
       end
     end
 

data/app/controllers/tienda/sessions_controller.rb

@@ -7,7 +7,7 @@ module Tienda
     def create
       if user = Tienda::User.authenticate(params[:email_address], params[:password])
         session[:tienda_user_id] = user.id
-        redirect_to :orders
+        redirect_to :root
       else
         flash.now[:alert] = t('tienda.sessions.create_alert')
         render action: "new"

data/app/controllers/tienda/stock_level_adjustments_controller.rb

@@ -1,11 +1,7 @@
 module Tienda
   class StockLevelAdjustmentsController < ApplicationController
 
-    SUITABLE_OBJECTS = ['Tienda::Product']
-    before_filter do
-      raise Tienda::Error, t('tienda.stock_level_adjustments.invalid_item_type', suitable_objects:  SUITABLE_OBJECTS.to_sentence) unless SUITABLE_OBJECTS.include?(params[:item_type])
-      @item = params[:item_type].constantize.find(params[:item_id].to_i)
-    end
+    before_filter { @item = Tienda::Product.find(params[:item_id].to_i) }
     before_filter { params[:id] && @sla = @item.stock_level_adjustments.find(params[:id].to_i) }
 
     def index

data/app/helpers/tienda/application_helper.rb

@@ -1,8 +1,14 @@
 module Tienda
   module ApplicationHelper
 
+    def body_class
+      "#{params[:controller].gsub('/', '_')}_#{params[:action]}"
+    end
+
     def navigation_manager_link(item)
-      link_to item.description, item.url(self), item.link_options.merge(:class => item.active?(self) ? 'active' : 'inactive')
+      link_to item.url(self), item.link_options.merge(class: item.active?(self) ? 'active-menu' : 'inactive') do
+        "<i class='fa #{item.icon}'></i>#{item.description}".html_safe
+      end
     end
 
     def status_tag(status)
@@ -32,8 +38,8 @@ module Tienda
       end
     end
 
-    def settings_label(field)
-      "<label for='settings_#{field}'>#{t("tienda.settings.labels.#{field}")}</label>".html_safe
+    def settings_label(field, html_class)
+      "<label for='settings_#{field}' class='#{html_class}'>#{t("tienda.settings.labels.#{field}")}</label>".html_safe
     end
 
     def settings_field(field, options = {})
@@ -52,7 +58,7 @@ module Tienda
           s << "</div>"
         end.html_safe
       else
-        text_field_tag "settings[#{field}]", value, options.merge(:placeholder => default, :class => 'text')
+        text_field_tag "settings[#{field}]", value, options.merge(:placeholder => default, :class => options[:class])
       end
     end
 

data/app/models/tienda/country.rb

@@ -9,19 +9,17 @@ module Tienda
 
   class Country < ActiveRecord::Base
 
-    self.table_name = 'tienda_countries'
-
     # All orders which have this country set as their billing country
-    has_many :billed_orders, :dependent => :restrict_with_exception, :class_name => 'Tienda::Order', :foreign_key => 'billing_country_id'
+    has_many :billed_orders, dependent: :restrict_with_exception, class_name: 'Tienda::Order', foreign_key: 'billing_country_id'
 
     # All orders which have this country set as their delivery country
-    has_many :delivered_orders, :dependent => :restrict_with_exception, :class_name => 'Tienda::Order', :foreign_key => 'delivery_country_id'
+    has_many :delivered_orders, dependent: :restrict_with_exception, class_name: 'Tienda::Order', foreign_key: 'delivery_country_id'
 
     # All countries ordered by their name asending
     scope :ordered, -> { order(:name => :asc) }
 
     # Validations
-    validates :name, :presence => true
+    validates :name, presence: true
 
   end
 end

data/app/models/tienda/delivery_service.rb

@@ -1,20 +1,18 @@
 module Tienda
   class DeliveryService < ActiveRecord::Base
 
-    self.table_name = 'tienda_delivery_services'
-
     # Validations
-    validates :name, :presence => true
-    validates :courier, :presence => true
+    validates :name, presence: true
+    validates :courier, presence: true
 
     # Orders which are assigned to this delivery service
-    has_many :orders, :dependent => :restrict_with_exception, :class_name => 'Tienda::Order'
+    has_many :orders, dependent: :restrict_with_exception
 
     # Prices for the different levels of service within this delivery service
-    has_many :delivery_service_prices, :dependent => :destroy, :class_name => 'Tienda::DeliveryServicePrice'
+    has_many :delivery_service_prices, dependent: :destroy
 
     # All active delivery services
-    scope :active, -> { where(:active => true)}
+    scope :active, -> { where(active: true)}
 
     # Returns a tracking URL for the passed order
     #

data/app/models/tienda/order/actions.rb

@@ -83,15 +83,15 @@ module Tienda
     end
 
     def deliver_accepted_order_email
-      Tienda::OrderMailer.accepted(self).deliver
+      Tienda::OrderMailer.accepted(self).deliver_now
     end
 
     def deliver_rejected_order_email
-      Tienda::OrderMailer.rejected(self).deliver
+      Tienda::OrderMailer.rejected(self).deliver_now
     end
 
     def deliver_received_order_email
-      Tienda::OrderMailer.received(self).deliver
+      Tienda::OrderMailer.received(self).deliver_now
     end
 
   end

data/app/models/tienda/order/delivery.rb

@@ -221,7 +221,7 @@ module Tienda
         self.status = 'shipped'
         self.consignment_number = consignment_number
         self.save!
-        Tienda::OrderMailer.shipped(self).deliver
+        Tienda::OrderMailer.shipped(self).deliver_now
       end
     end