From 39a79869c0d9982bd7889b5b044d88ae4b8be59e Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Mon, 28 Jul 2014 16:12:32 +1000 Subject: [PATCH] Disabling buttons and some work on the price breakdowns, including commenting them out for now --- .../controllers/products_controller.js.coffee | 3 +- .../directives/price_breakdown.js.coffee | 6 +- .../templates/price_breakdown.html.haml | 2 +- app/views/shared/menu/_mobile_menu.html.haml | 3 +- app/views/shop/products/_form.html.haml | 73 ++++++++++--------- app/views/shop/products/_master.html.haml | 8 +- 6 files changed, 48 insertions(+), 47 deletions(-) diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee index 3ef47530c9..da595418da 100644 --- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee @@ -1,5 +1,6 @@ -Darkswarm.controller "ProductsCtrl", ($scope, $rootScope, Products, OrderCycle, FilterSelectorsService) -> +Darkswarm.controller "ProductsCtrl", ($scope, $rootScope, Products, OrderCycle, FilterSelectorsService, Cart) -> $scope.Products = Products + $scope.Cart = Cart $scope.totalActive = FilterSelectorsService.totalActive $scope.clearAll = FilterSelectorsService.clearAll $scope.filterText = FilterSelectorsService.filterText diff --git a/app/assets/javascripts/darkswarm/directives/price_breakdown.js.coffee b/app/assets/javascripts/darkswarm/directives/price_breakdown.js.coffee index 7e2120a7ba..4875cf81ec 100644 --- a/app/assets/javascripts/darkswarm/directives/price_breakdown.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/price_breakdown.js.coffee @@ -4,12 +4,8 @@ Darkswarm.directive "priceBreakdown", ($tooltip)-> variant: "=" tooltip -Darkswarm.directive 'priceBreakdownPopup', ()-> +Darkswarm.directive 'priceBreakdownPopup', -> restrict: 'EA' replace: true templateUrl: 'price_breakdown.html' scope: true - #link: (scope, elem, attrs)-> - #angular.element($window).bind 'click', -> - #scope.tt_isOpen = false - #elem.remove() diff --git a/app/assets/javascripts/templates/price_breakdown.html.haml b/app/assets/javascripts/templates/price_breakdown.html.haml index 635faf797f..5e7c82e0cf 100644 --- a/app/assets/javascripts/templates/price_breakdown.html.haml +++ b/app/assets/javascripts/templates/price_breakdown.html.haml @@ -1,4 +1,4 @@ -.joyride-tip-guide{"ng-class" => "{ in: isOpen(), fade: animation() }"} +.joyride-tip-guide{"ng-class" => "{ in: tt_isOpen, fade: tt_animation }"} %span.joyride-nub.bottom .joyride-content-wrapper {{ variant.id }} diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml index df468363bd..6cc81cab9d 100644 --- a/app/views/shared/menu/_mobile_menu.html.haml +++ b/app/views/shared/menu/_mobile_menu.html.haml @@ -3,7 +3,8 @@ %a.left-off-canvas-toggle.menu-icon %span %section.right - = render partial: "shared/menu/cart" + .cart + = render partial: "shared/menu/cart" %a{href: main_app.shop_path} {{ CurrentHub.hub.name }} diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml index 59e792c560..f27bbc17db 100644 --- a/app/views/shop/products/_form.html.haml +++ b/app/views/shop/products/_form.html.haml @@ -1,47 +1,50 @@ %products.small-12.columns{"ng-controller" => "ProductsCtrl", "ng-show" => "order_cycle.order_cycle_id != null", "infinite-scroll" => "incrementLimit()", "infinite-scroll-distance" => "1"} - %form.custom - .row - .small-12.medium-8.large-9.columns - %input#search.text{"ng-model" => "query", - placeholder: "Search by product or producer", - "ng-debounce" => "100", - "ofn-disable-enter" => true} + .row + .small-12.medium-8.large-9.columns + %input#search.text{"ng-model" => "query", + placeholder: "Search by product or producer", + "ng-debounce" => "100", + "ofn-disable-enter" => true} - = render partial: "shop/products/filters" + = render partial: "shop/products/filters" + %form{action: cart_path} .small-12.medium-4.large-3.columns - %input.button.primary.right.add_to_cart{type: :submit, value: "Checkout now"} + %input.button.primary.right.add_to_cart{type: :submit, value: "Checkout now", + "ng-disabled" => "Cart.dirty"} - %div.pad-top{bindonce: true} - %product.animate-repeat{"ng-controller" => "ProductNodeCtrl", - "ng-repeat" => "product in filteredProducts = (Products.products | products:query | taxons:activeTaxons | orderBy:ordering.order) track by product.id "} - .product-thumb - %a{"ng-click" => "triggerProductModal()"} - %img{"bo-src" => "product.master.images[0].small_url", "ng-click" => "triggerProductModal()"} + %div.pad-top{bindonce: true} + %product.animate-repeat{"ng-controller" => "ProductNodeCtrl", + "ng-repeat" => "product in filteredProducts = (Products.products | products:query | taxons:activeTaxons | orderBy:ordering.order) track by product.id "} + .product-thumb + %a{"ng-click" => "triggerProductModal()"} + %img{"bo-src" => "product.master.images[0].small_url", "ng-click" => "triggerProductModal()"} - = render partial: "shop/products/summary" + = render partial: "shop/products/summary" - %span{"bo-if" => "product.hasVariants"} - = render partial: "shop/products/variants" + %span{"bo-if" => "product.hasVariants"} + = render partial: "shop/products/variants" - .variants.row{"bo-if" => "!product.hasVariants"} - = render partial: "shop/products/master" - - %product{"ng-show" => "Products.loading"} - .row.summary - .small-12.columns.text-center - Loading products + .variants.row{"bo-if" => "!product.hasVariants"} + = render partial: "shop/products/master" + + %product{"ng-show" => "Products.loading"} + .row.summary + .small-12.columns.text-center + Loading products - %div{"ng-show" => "filteredProducts.length == 0 && !Products.loading"} - .row.summary - .small-12.columns - %p.no-results - Sorry, no results found for - %strong {{query}}. - Try another search? - .row - .small-12.columns - %input.button.primary.right.add_to_cart{type: :submit, value: "Checkout now"} + %div{"ng-show" => "filteredProducts.length == 0 && !Products.loading"} + .row.summary + .small-12.columns + %p.no-results + Sorry, no results found for + %strong {{query}}. + Try another search? + .row + .small-12.columns + %form{action: cart_path} + %input.button.primary.right.add_to_cart{type: :submit, value: "Checkout now", + "ng-disabled" => "Cart.dirty"} diff --git a/app/views/shop/products/_master.html.haml b/app/views/shop/products/_master.html.haml index 73fc32ea14..f12df1b881 100644 --- a/app/views/shop/products/_master.html.haml +++ b/app/views/shop/products/_master.html.haml @@ -47,10 +47,10 @@ .table-cell %i.ofn-i_009-close {{ product.master.price | currency }} - %button.graph-button{"price-breakdown" => "_", - "variant" => "product.master", - "price-breakdown-animation" => "true"} - %i.ofn-i-058-graph + -#%button.graph-button{"price-breakdown" => "_", + -#"variant" => "product.master", + -#"price-breakdown-animation" => "true"} + -#%i.ofn-i-058-graph .small-12.medium-2.large-2.columns.total-price.text-right .table-cell