[shopping-cart-plugin] Fixing Chromium problem

* The history.go used to revert the url don't work properly on chromium. We're commenting it for now to avoid problems. * Also fixing the show/hide feature.

[shopping-cart-plugin] Fixing Chromium problem
* The history.go used to revert the url don't work properly on chromium. We're commenting it for now to avoid problems. * Also fixing the show/hide feature.
Rodrigo Souto
1 parent eb68553a
Showing 2 changed files with 82 additions and 7 deletions Show diff stats
plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb
plugins/shopping_cart/public/cart.js
@@ -108,6 +108,48 @@ class ShoppingCartPluginProfileController &lt; ProfileController
     end
   end
+  def visibility
+    render :text => session[:cart].has_key?(:visibility) ? session[:cart][:visibility].to_json : true.to_json
+  end
+
+  def show
+    begin
+      session[:cart][:visibility] = true
+      render :text => {
+        :ok => true,
+        :message => _('Cart displayed.'),
+        :error => {:code => 0}
+      }.to_json
+    rescue Exception => exception
+      render :text => {
+        :ok => false,
+        :error => {
+          :code => 7,
+          :message => exception.message
+        }
+      }.to_json
+    end
+  end
+
+  def hide
+    begin
+      session[:cart][:visibility] = false
+      render :text => {
+        :ok => true,
+        :message => _('Cart Hidden.'),
+        :error => {:code => 0}
+      }.to_json
+    rescue Exception => exception
+      render :text => {
+        :ok => false,
+        :error => {
+          :code => 8,
+          :message => exception.message
+        }
+      }.to_json
+    end
+  end
+
   private
   def validate_same_enterprise
@@ -6,13 +6,26 @@ function Cart(config) {
   this.contentBox = $("#cart1 .cart-content");
   this.itemsBox = $("#cart1 .cart-items");
   this.items = {};
+  this.empty = !config.hasProducts;
   this.visible = false;
   $(".cart-buy", this.cartElem).button({ icons: { primary: 'ui-icon-cart'} });
-  if (config.hasProducts) {
+  if (!this.empty) {
     $(this.cartElem).show();
     this.enterprise = config.enterprise;
+    me = this;
+    $.ajax({
+      url: '/profile/'+ this.enterprise +'/plugins/shopping_cart/visibility',
+      dataType: 'json',
+      success: function(data, status, ajax){
+        me.visible = /^true$/i.test(data);
+        me.listProducts();
+      },
+      cache: false,
+      error: function(ajax, status, errorThrown) {
+        alert('Visibility - HTTP '+status+': '+errorThrown);
+      }
+    });
     $(".cart-buy", this.cartElem).colorbox({href: '/profile/' + this.enterprise + '/plugins/shopping_cart/buy'});
-    this.listProducts();
   }
 }
@@ -63,17 +76,20 @@ function Cart(config) {
       input.onchange = function() {
         me.updateQuantity(this, this.itemId, this.value);
       };
-      document.location.href = "#"+liId;
-      document.location.href = "#"+this.cartElem.id;
-      history.go(-2);
+//      document.location.href = "#"+liId;
+//      document.location.href = "#"+this.cartElem.id;
+//      history.go(-2);
       var liBg = li.css("background-color");
       li[0].style.backgroundColor = "#FF0";
       li.animate({ backgroundColor: liBg }, 1000);
     }
-    if( !this.visible ) {
+
+    if (!clear && this.empty) $(this.cartElem).show();
+    if((!clear && this.empty) || (this.visible && clear)) {
       this.contentBox.hide();
       this.show();
     }
+    this.empty = false;
   }
   Cart.prototype.updateQuantity = function(input, itemId, quantity) {
@@ -135,7 +151,7 @@ function Cart(config) {
     if(!this.enterprise) {
       this.enterprise = enterprise;
       $(".cart-buy", this.cartElem).colorbox({href: '/profile/' + this.enterprise + '/plugins/shopping_cart/buy'});
-      if( !this.visible ) $(this.cartElem).show();
+//      $(this.cartElem).show();
     }
     var me = this;
     $.ajax({
@@ -183,6 +199,14 @@ function Cart(config) {
   }
   Cart.prototype.show = function() {
+    $.ajax({
+      url: '/profile/'+ this.enterprise +'/plugins/shopping_cart/show',
+      dataType: 'json',
+      cache: false,
+      error: function(ajax, status, errorThrown) {
+        alert('Show - HTTP '+status+': '+errorThrown);
+      }
+    });
     this.visible = true;
     this.contentBox.slideDown(500);
     $(".cart-toggle .str-show", this.cartElem).hide();
@@ -190,6 +214,14 @@ function Cart(config) {
   }
   Cart.prototype.hide = function() {
+    $.ajax({
+      url: '/profile/'+ this.enterprise +'/plugins/shopping_cart/hide',
+      dataType: 'json',
+      cache: false,
+      error: function(ajax, status, errorThrown) {
+        alert('Hide - HTTP '+status+': '+errorThrown);
+      }
+    });
     this.visible = false;
     this.contentBox.slideUp(500);
     $(".cart-toggle .str-show", this.cartElem).show();
@@ -231,6 +263,7 @@ function Cart(config) {
             me.hide();
             me.enterprise = null;
             me.updateTotal();
+            me.empty = true;
           });
         }
       },
	@@ -108,6 +108,48 @@ class ShoppingCartPluginProfileController < ProfileController		@@ -108,6 +108,48 @@ class ShoppingCartPluginProfileController < ProfileController
108	end	108	end
109	end	109	end
110		110
		111	+ def visibility
		112	+ render :text => session[:cart].has_key?(:visibility) ? session[:cart][:visibility].to_json : true.to_json
		113	+ end
		114	+
		115	+ def show
		116	+ begin
		117	+ session[:cart][:visibility] = true
		118	+ render :text => {
		119	+ :ok => true,
		120	+ :message => _('Cart displayed.'),
		121	+ :error => {:code => 0}
		122	+ }.to_json
		123	+ rescue Exception => exception
		124	+ render :text => {
		125	+ :ok => false,
		126	+ :error => {
		127	+ :code => 7,
		128	+ :message => exception.message
		129	+ }
		130	+ }.to_json
		131	+ end
		132	+ end
		133	+
		134	+ def hide
		135	+ begin
		136	+ session[:cart][:visibility] = false
		137	+ render :text => {
		138	+ :ok => true,
		139	+ :message => _('Cart Hidden.'),
		140	+ :error => {:code => 0}
		141	+ }.to_json
		142	+ rescue Exception => exception
		143	+ render :text => {
		144	+ :ok => false,
		145	+ :error => {
		146	+ :code => 8,
		147	+ :message => exception.message
		148	+ }
		149	+ }.to_json
		150	+ end
		151	+ end
		152	+
111	private	153	private
112		154
113	def validate_same_enterprise	155	def validate_same_enterprise