shoppe 0.0.14 → 0.0.15

data/app/assets/javascripts/shoppe/application.coffee

@@ -1,7 +1,9 @@
 #= require jquery
 #= require jquery_ujs
+#= require shoppe/mousetrap
 #= require shoppe/jquery_ui
 #= require shoppe/chosen.jquery
+#= require nifty/dialog
 #= require_tree .
 
 $ ->
@@ -39,4 +41,58 @@ $ ->
   
   # Chosen
   $('select.chosen').chosen()
-  $('select.chosen-with-deselect').chosen({allow_single_deselect: true})
+  $('select.chosen-with-deselect').chosen({allow_single_deselect: true})
+  
+  # Open AJAX dialogs
+  $('a[rel=dialog]').on 'click', ->
+    element = $(this)
+    options = {}
+    options.width = element.data('dialog-width') if element.data('dialog-width')
+    options.offset = element.data('dialog-offset') if element.data('dialog-offset')
+    options.behavior = element.data('dialog-behavior') if element.data('dialog-behavior')
+    options.id = 'ajax'
+    options.url = element.attr('href')
+    Nifty.Dialog.open(options)
+    false
+
+#
+# Stock Level Adjustment dialog beavior
+#
+Nifty.Dialog.addBehavior
+  name: 'stockLevelAdjustments'
+  onLoad: (dialog,options)->
+    $('input[type=text]:first', dialog).focus()
+    $(dialog).on 'submit', 'form', ->
+      form = $(this)
+      $.ajax
+        url: form.attr('action')
+        method: 'POST'
+        data: form.serialize()
+        dataType: 'text'
+        success: (data)->
+          $('div.table', dialog).replaceWith(data)
+          $('input[type=text]:first', dialog).focus()
+        error: (xhr)->
+          if xhr.status == 422
+            alert xhr.responseText
+          else
+            alert 'An error occurred while saving the stock level.'
+      false
+    $(dialog).on 'click', 'nav.pagination a', ->
+      $.ajax
+        url: $(this).attr('href')
+        success: (data)->
+          $('div.table', dialog).replaceWith(data)
+      false
+      
+#
+# Always fire keyboard shortcuts when focused on fields
+#
+Mousetrap.stopCallback = -> false
+
+#
+# Close dialogs on escape
+#
+Mousetrap.bind 'escape', ->
+  Nifty.Dialog.closeTopDialog()
+  false

data/app/assets/javascripts/shoppe/mousetrap.js

@@ -0,0 +1,9 @@
+/* mousetrap v1.4.5 craig.is/killing/mice */
+(function(J,r,f){function s(a,b,c){a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent("on"+b,c)}function A(a){if("keypress"==a.type){var b=String.fromCharCode(a.which);a.shiftKey||(b=b.toLowerCase());return b}return h[a.which]?h[a.which]:B[a.which]?B[a.which]:String.fromCharCode(a.which).toLowerCase()}function t(a){a=a||{};var b=!1,c;for(c in n)a[c]?b=!0:n[c]=0;b||(u=!1)}function C(a,b,c,d,e,v){var g,k,f=[],h=c.type;if(!l[a])return[];"keyup"==h&&w(a)&&(b=[a]);for(g=0;g<l[a].length;++g)if(k=
+l[a][g],!(!d&&k.seq&&n[k.seq]!=k.level||h!=k.action||("keypress"!=h||c.metaKey||c.ctrlKey)&&b.sort().join(",")!==k.modifiers.sort().join(","))){var m=d&&k.seq==d&&k.level==v;(!d&&k.combo==e||m)&&l[a].splice(g,1);f.push(k)}return f}function K(a){var b=[];a.shiftKey&&b.push("shift");a.altKey&&b.push("alt");a.ctrlKey&&b.push("ctrl");a.metaKey&&b.push("meta");return b}function x(a,b,c){m.stopCallback(b,b.target||b.srcElement,c)||!1!==a(b,c)||(b.preventDefault&&b.preventDefault(),b.stopPropagation&&b.stopPropagation(),
+b.returnValue=!1,b.cancelBubble=!0)}function y(a){"number"!==typeof a.which&&(a.which=a.keyCode);var b=A(a);b&&("keyup"==a.type&&z===b?z=!1:m.handleKey(b,K(a),a))}function w(a){return"shift"==a||"ctrl"==a||"alt"==a||"meta"==a}function L(a,b,c,d){function e(b){return function(){u=b;++n[a];clearTimeout(D);D=setTimeout(t,1E3)}}function v(b){x(c,b,a);"keyup"!==d&&(z=A(b));setTimeout(t,10)}for(var g=n[a]=0;g<b.length;++g){var f=g+1===b.length?v:e(d||E(b[g+1]).action);F(b[g],f,d,a,g)}}function E(a,b){var c,
+d,e,f=[];c="+"===a?["+"]:a.split("+");for(e=0;e<c.length;++e)d=c[e],G[d]&&(d=G[d]),b&&"keypress"!=b&&H[d]&&(d=H[d],f.push("shift")),w(d)&&f.push(d);c=d;e=b;if(!e){if(!p){p={};for(var g in h)95<g&&112>g||h.hasOwnProperty(g)&&(p[h[g]]=g)}e=p[c]?"keydown":"keypress"}"keypress"==e&&f.length&&(e="keydown");return{key:d,modifiers:f,action:e}}function F(a,b,c,d,e){q[a+":"+c]=b;a=a.replace(/\s+/g," ");var f=a.split(" ");1<f.length?L(a,f,b,c):(c=E(a,c),l[c.key]=l[c.key]||[],C(c.key,c.modifiers,{type:c.action},
+d,a,e),l[c.key][d?"unshift":"push"]({callback:b,modifiers:c.modifiers,action:c.action,seq:d,level:e,combo:a}))}var h={8:"backspace",9:"tab",13:"enter",16:"shift",17:"ctrl",18:"alt",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"ins",46:"del",91:"meta",93:"meta",224:"meta"},B={106:"*",107:"+",109:"-",110:".",111:"/",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},H={"~":"`","!":"1",
+"@":"2","#":"3",$:"4","%":"5","^":"6","&":"7","*":"8","(":"9",")":"0",_:"-","+":"=",":":";",'"':"'","<":",",">":".","?":"/","|":"\\"},G={option:"alt",command:"meta","return":"enter",escape:"esc",mod:/Mac|iPod|iPhone|iPad/.test(navigator.platform)?"meta":"ctrl"},p,l={},q={},n={},D,z=!1,I=!1,u=!1;for(f=1;20>f;++f)h[111+f]="f"+f;for(f=0;9>=f;++f)h[f+96]=f;s(r,"keypress",y);s(r,"keydown",y);s(r,"keyup",y);var m={bind:function(a,b,c){a=a instanceof Array?a:[a];for(var d=0;d<a.length;++d)F(a[d],b,c);return this},
+unbind:function(a,b){return m.bind(a,function(){},b)},trigger:function(a,b){if(q[a+":"+b])q[a+":"+b]({},a);return this},reset:function(){l={};q={};return this},stopCallback:function(a,b){return-1<(" "+b.className+" ").indexOf(" mousetrap ")?!1:"INPUT"==b.tagName||"SELECT"==b.tagName||"TEXTAREA"==b.tagName||b.isContentEditable},handleKey:function(a,b,c){var d=C(a,b,c),e;b={};var f=0,g=!1;for(e=0;e<d.length;++e)d[e].seq&&(f=Math.max(f,d[e].level));for(e=0;e<d.length;++e)d[e].seq?d[e].level==f&&(g=!0,
+b[d[e].seq]=1,x(d[e].callback,c,d[e].combo)):g||x(d[e].callback,c,d[e].combo);d="keypress"==c.type&&I;c.type!=u||w(a)||d||t(b);I=g&&"keydown"==c.type}};J.Mousetrap=m;"function"===typeof define&&define.amd&&define(m)})(window,document);

data/app/assets/stylesheets/shoppe/application.scss

@@ -2,6 +2,8 @@
  *= require shoppe/reset
  *= require shoppe/elements
  *= require shoppe/chosen
+ *= require nifty/dialog
+ *= require shoppe/dialog
  *= require_self
  */
 
@@ -106,40 +108,7 @@ header.main {
 		padding:15px;
 		h3 { font-size:2.0em; font-weight:500;}
 	}
-	
-	//
-	// data table
-	//
-	div.table {
-		p.info {
-			overflow:hidden;
-			margin-bottom:10px;
-			color:#40454D;
-		}
-		table.data {
-			width:100%;
-			th, td { padding:10px;}
-			thead th { border:1px solid #40454D; background:#40454D; text-align:left; font-weight:normal; font-size:0.9em; color:#fff; }
-			tbody td { border:1px solid #cfd4dd; background:#fff;}
-			a { color:inherit;}
-			tbody th { text-align:left; background:#5B6270; border:1px solid #5B6270;font-size:1.2em; color:#fff;}
-			tbody tr.empty td { padding:50px 0; text-align:center; color:#999; font-style:italic;}
-			tfoot td.right { text-align:right; }
-			tfoot td.bold { font-weight:bold;}
-			tfoot td { border-top:0 solid #ccc; background:#fafafa;}
-			tfoot tr:first-child td { border-top-width:3px;}
-			tbody td a.edit { background:image-url('shoppe/icons/edit.svg') no-repeat; margin-top:3px;width:16px; width:16px; background-size:13px; display:inline-block; text-indent:-40000px; opacity:0.3}
-			tbody td a.edit:hover { opacity:0.5}
-			tbody tr.form {
-				td { background:#f2f6fb;}
-				input[type=text] { border:1px solid #CFD4DD; padding:5px;}
-				input[type=text]:focus { border-color:#9AC835;}
-				td.desc input[type=text] { width:95%;}
-				td.adjustment input[type=text] { width:50px; margin-right:5px;}
-			}
-		}
-	}
-	
+		
 	
 	//
 	// Status tags
@@ -295,7 +264,7 @@ header.main {
 			
 			dl.form {
 				margin-top:15px;
-				input.text { width:70%}
+				input.text { width:70%;}
 				a.button { margin-right:5px;}
 			}
 			
@@ -360,30 +329,7 @@ header.main {
 			float:right;
 		}
 	}
-	
-	//
-	// pagination
-	//
-	nav.pagination {
-		display:block;
-		margin:25px 0;
-		overflow:hidden;
-		text-align:center;
-		span {
-			display:inline-block;
-			border:1px solid #ccc;
-			margin-right:3px;
-			color:#333;
-			background:#fff;
-			&.current { background:#9AC835; border-color:#7B9F26; color:#fff; font-weight:600; padding:5px 10px;}
-			a {
-				padding:5px 10px;
-				display:inline-block;
-				color:inherit;
-				text-decoration:none;
-			}
-		}
-	}
+
 	
 	
 	
@@ -426,4 +372,69 @@ input.text, textarea.text {
 	font-family:$font;
 	&:focus { border-color:#9AC835; }
 	&.short { width:100px;}
+}
+
+//
+// data table
+//
+div.table {
+	p.info {
+		overflow:hidden;
+		margin-bottom:10px;
+		color:#40454D;
+	}
+	table.data {
+		width:100%;
+		th, td { padding:10px; vertical-align:middle;}
+		thead th { border:1px solid #40454D; background:#40454D; text-align:left; font-weight:normal; font-size:0.9em; color:#fff; }
+		tbody td { border:1px solid #cfd4dd; background:#fff;}
+		a { color:inherit;}
+		tbody th { text-align:left; background:#5B6270; border:1px solid #5B6270;font-size:1.2em; color:#fff;}
+		tbody tr.empty td { padding:50px 0; text-align:center; color:#999; font-style:italic;}
+		tfoot td.right { text-align:right; }
+		tfoot td.bold { font-weight:bold;}
+		tfoot td { border-top:0 solid #ccc; background:#fafafa;}
+		tfoot tr:first-child td { border-top-width:3px;}
+		tbody td a.edit { background:image-url('shoppe/icons/edit.svg') no-repeat; margin-top:3px;width:16px; width:16px; background-size:13px; display:inline-block; text-indent:-40000px; opacity:0.3}
+		tbody td a.edit:hover { opacity:0.5}
+		tbody td.table {
+			padding:0;
+			table.data {
+				td { padding:10px; border-width:0; border-right-width:1px; border-bottom-width:1px;}
+				td:last-child { border-right-width:0;}
+				tr:last-child td { border-bottom-width:0;}
+			}
+		} 
+		tbody tr.form {
+			td { background:#f2f6fb;}
+			input[type=text] { border:1px solid #CFD4DD; padding:5px;}
+			input[type=text]:focus { border-color:#9AC835;}
+			td.desc input[type=text] { width:95%;}
+			td.adjustment input[type=text] { width:50px; margin-right:5px;}
+		}
+	}
+}
+
+//
+// pagination
+//
+nav.pagination {
+	display:block;
+	margin:25px 0;
+	overflow:hidden;
+	text-align:center;
+	span {
+		display:inline-block;
+		border:1px solid #ccc;
+		margin-right:3px;
+		color:#333;
+		background:#fff;
+		&.current { background:#9AC835; border-color:#7B9F26; color:#fff; font-weight:600; padding:5px 10px;}
+		a {
+			padding:5px 10px;
+			display:inline-block;
+			color:inherit;
+			text-decoration:none;
+		}
+	}
 }

data/app/assets/stylesheets/shoppe/dialog.scss

@@ -0,0 +1,10 @@
+div.niftyDialog {
+	h2 {
+		background:#fff;
+		border-bottom:1px solid #efefef;
+		font-size:1.2em;
+		color:#111;
+	}
+	padding:15px;
+	nav.pagination { margin:0; margin-top:15px;}
+}

data/app/assets/stylesheets/shoppe/sub.scss

@@ -35,6 +35,21 @@ html.login {
 		padding:15px 0;
 	}
 	
+	//
+	// Error
+	//
+	div.error {
+    background:#fff;
+    width:400px;
+    margin:auto;
+    margin-top:200px;
+		padding:25px;
+		line-height:1.5;
+		font-size:0.9em;
+		font-weight:500;
+		text-align:center;
+		p.back { margin-top:25px;}
+  }
 	
   //
   // Primary login area

data/app/controllers/shoppe/application_controller.rb

@@ -8,6 +8,11 @@ module Shoppe
     rescue_from ActiveRecord::DeleteRestrictionError do |e|
       redirect_to request.referer || root_path, :alert => e.message
     end
+    
+    rescue_from Shoppe::Error do |e|
+      @exception = e
+      render :layout => 'shoppe/sub', :template => 'shoppe/shared/error'
+    end
 
     private
 
@@ -26,7 +31,7 @@ module Shoppe
     
     # Returns the currently logged in user
     def current_user
-      @current_user ||= login_from_session || :false
+      @current_user ||= login_from_session || login_with_demo_mdoe || :false
     end
 
     # Attempt to find a user based on the value stored in the local session
@@ -36,6 +41,13 @@ module Shoppe
       end
     end
     
+    # Attempt to login using the demo mode
+    def login_with_demo_mdoe
+      if Shoppe.config[:demo_mode]
+        @user = User.first
+      end
+    end
+    
     # Expose a current_user and logged_in? as helpers to views
     helper_method :current_user, :logged_in?
     

data/app/controllers/shoppe/attachments_controller.rb

@@ -1,12 +1,14 @@
-class Shoppe::AttachmentsController < Shoppe::ApplicationController
+module Shoppe
+  class AttachmentsController < Shoppe::ApplicationController
   
-  def destroy
-    @attachment = Nifty::Attachments::Attachment.find(params[:id])
-    @attachment.destroy
-    respond_to do |wants|
-      wants.html { redirect_to request.referer, :notice => "Attachment removed successfully" }
-      wants.json { render :status => 'complete' }
+    def destroy
+      @attachment = Nifty::Attachments::Attachment.find(params[:id])
+      @attachment.destroy
+      respond_to do |wants|
+        wants.html { redirect_to request.referer, :notice => "Attachment removed successfully" }
+        wants.json { render :status => 'complete' }
+      end
     end
-  end
   
+  end
 end

data/app/controllers/shoppe/dashboard_controller.rb

@@ -1,7 +1,9 @@
-class Shoppe::DashboardController < Shoppe::ApplicationController
+module Shoppe
+  class DashboardController < Shoppe::ApplicationController
   
-  def home
-    redirect_to :orders
-  end
+    def home
+      redirect_to :orders
+    end
   
+  end
 end

data/app/controllers/shoppe/delivery_service_prices_controller.rb

@@ -1,43 +1,45 @@
-class Shoppe::DeliveryServicePricesController < Shoppe::ApplicationController
+module Shoppe
+  class DeliveryServicePricesController < Shoppe::ApplicationController
 
-  before_filter { @active_nav = :delivery_services }
-  before_filter { @delivery_service = Shoppe::DeliveryService.find(params[:delivery_service_id])}
-  before_filter { params[:id] && @delivery_service_price = @delivery_service.delivery_service_prices.find(params[:id])}
+    before_filter { @active_nav = :delivery_services }
+    before_filter { @delivery_service = Shoppe::DeliveryService.find(params[:delivery_service_id])}
+    before_filter { params[:id] && @delivery_service_price = @delivery_service.delivery_service_prices.find(params[:id])}
   
-  def index
-    @delivery_service_prices = @delivery_service.delivery_service_prices.ordered
-  end
+    def index
+      @delivery_service_prices = @delivery_service.delivery_service_prices.ordered
+    end
   
-  def new
-    @delivery_service_price = @delivery_service.delivery_service_prices.build
-  end
+    def new
+      @delivery_service_price = @delivery_service.delivery_service_prices.build
+    end
   
-  def create
-    @delivery_service_price = @delivery_service.delivery_service_prices.build(safe_params)
-    if @delivery_service_price.save
-      redirect_to [@delivery_service, :delivery_service_prices], :notice => "Price has been created successfully"
-    else
-      render :action => "new"
+    def create
+      @delivery_service_price = @delivery_service.delivery_service_prices.build(safe_params)
+      if @delivery_service_price.save
+        redirect_to [@delivery_service, :delivery_service_prices], :notice => "Price has been created successfully"
+      else
+        render :action => "new"
+      end
     end
-  end
   
-  def update
-    if @delivery_service_price.update(safe_params)
-      redirect_to [@delivery_service, :delivery_service_prices], :notice => "Price has been updated successfully"
-    else
-      render :action => "edit"
+    def update
+      if @delivery_service_price.update(safe_params)
+        redirect_to [@delivery_service, :delivery_service_prices], :notice => "Price has been updated successfully"
+      else
+        render :action => "edit"
+      end
     end
-  end
   
-  def destroy
-    @delivery_service_price.destroy
-    redirect_to [@delivery_service, :delivery_service_prices], :notice => "Price has been removed successfully"
-  end
+    def destroy
+      @delivery_service_price.destroy
+      redirect_to [@delivery_service, :delivery_service_prices], :notice => "Price has been removed successfully"
+    end
   
-  private
+    private
   
-  def safe_params
-    params[:delivery_service_price].permit(:price, :cost_price, :tax_rate_id, :min_weight, :max_weight, :code, :country_ids => [])
-  end
+    def safe_params
+      params[:delivery_service_price].permit(:price, :cost_price, :tax_rate_id, :min_weight, :max_weight, :code, :country_ids => [])
+    end
   
+  end
 end

data/app/controllers/shoppe/delivery_services_controller.rb

@@ -1,45 +1,47 @@
-class Shoppe::DeliveryServicesController < Shoppe::ApplicationController
+module Shoppe
+  class DeliveryServicesController < Shoppe::ApplicationController
   
-  before_filter { @active_nav = :delivery_services }
-  before_filter { params[:id] && @delivery_service = Shoppe::DeliveryService.find(params[:id]) }
+    before_filter { @active_nav = :delivery_services }
+    before_filter { params[:id] && @delivery_service = Shoppe::DeliveryService.find(params[:id]) }
   
-  def index
-    @delivery_services = Shoppe::DeliveryService.all
-  end
+    def index
+      @delivery_services = Shoppe::DeliveryService.all
+    end
   
-  def new
-    @delivery_service = Shoppe::DeliveryService.new
-  end
+    def new
+      @delivery_service = Shoppe::DeliveryService.new
+    end
   
-  def create
-    @delivery_service = DeliveryService.new(safe_params)
-    if @delivery_service.save
-      redirect_to :delivery_services, :flash => {:notice => "Delivery Service has been created successfully"}
-    else
-      render :action => "new"
+    def create
+      @delivery_service = Shoppe::DeliveryService.new(safe_params)
+      if @delivery_service.save
+        redirect_to :delivery_services, :flash => {:notice => "Delivery Service has been created successfully"}
+      else
+        render :action => "new"
+      end
     end
-  end
   
-  def edit
-  end
+    def edit
+    end
   
-  def update
-    if @delivery_service.update(safe_params)
-      redirect_to [:edit, @delivery_service], :flash => {:notice => "Delivery Service has been updated successfully"}
-    else
-      render :action => "edit"
+    def update
+      if @delivery_service.update(safe_params)
+        redirect_to [:edit, @delivery_service], :flash => {:notice => "Delivery Service has been updated successfully"}
+      else
+        render :action => "edit"
+      end
     end
-  end
   
-  def destroy
-    @delivery_service.destroy
-    redirect_to :delivery_services, :flash => {:notice => "Delivery Service has been removed successfully"}
-  end
+    def destroy
+      @delivery_service.destroy
+      redirect_to :delivery_services, :flash => {:notice => "Delivery Service has been removed successfully"}
+    end
   
-  private
+    private
   
-  def safe_params
-    params[:delivery_service].permit(:name, :code, :active, :default, :courier, :tracking_url)
-  end
+    def safe_params
+      params[:delivery_service].permit(:name, :code, :active, :default, :courier, :tracking_url)
+    end
   
+  end
 end