publish: #26960 Display Global Errors for Cart Endpoint

generated from commit 9b571d8
volusion-angular-themes · Aug 15, 2014 · c3012c6 · c3012c6
1 parent 4f41775
commit c3012c6
Show file tree

Hide file tree

Showing 10 changed files with 1,633 additions and 1,396 deletions.
diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!doctype html><html class="no-js" ng-app="methodApp" data-ng-strict-di><head data-vn-meta-tags data-title="seo.metaTagTitle" data-description="seo.metaTagDescription" data-keywords="seo.metaTagKeywords" data-robots="seo.enableRobotsMetatags" data-to-append="seo.globallyAppendedMetatags"><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="fragment" content="!"><title>Volusion AngularJS Method Theme</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="/styles/049db49b.vendor.css"><link rel="stylesheet" href="/styles/c6451e97.main.css"><link rel="stylesheet" ng-href="{{ overridesCSS }}"><base href="/"></head><body role="document" data-ng-controller="MainCtrl"><!--[if lt IE 9]>
+<!doctype html><html class="no-js" ng-app="methodApp" data-ng-strict-di><head data-vn-meta-tags data-title="seo.metaTagTitle" data-description="seo.metaTagDescription" data-keywords="seo.metaTagKeywords" data-robots="seo.enableRobotsMetatags" data-to-append="seo.globallyAppendedMetatags"><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="fragment" content="!"><title>Volusion AngularJS Method Theme</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="/styles/75546422.vendor.css"><link rel="stylesheet" href="/styles/bcdd55ed.main.css"><link rel="stylesheet" ng-href="{{ overridesCSS }}"><base href="/"></head><body role="document" data-ng-controller="MainCtrl"><!--[if lt IE 9]>
 	<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a>
 	to improve your experience.</p>
-	<![endif]--><!-- Mobile Menu --><div data-ng-include=" 'views/partials/mobile-menu.html' "></div><div snap-content data-snap-ignore="true"><a id="top"></a> <!-- Header --><div id="header" ng-include=" 'views/partials/header.html' "></div><!-- Main Content --><div class="vn-showcase" role="main" autoscroll="false" ng-view=""></div><!-- Footer --><div ng-include=" 'views/partials/footer.html' "></div></div><script src="scripts/87ffbb79.vendor.js"></script><script src="/scripts/a267f149.scripts.js"></script></body></html>
+	<![endif]--><!-- Mobile Menu --><div data-ng-include=" 'views/partials/mobile-menu.html' "></div><div snap-content data-snap-ignore="true"><a id="top"></a> <!-- Header --><div id="header" ng-include=" 'views/partials/header.html' "></div><!-- Main Content --><div class="vn-showcase" role="main" autoscroll="false" ng-view=""></div><!-- Footer --><div ng-include=" 'views/partials/footer.html' "></div></div><script src="scripts/097b500d.vendor.js"></script><script src="/scripts/240bdf93.scripts.js"></script></body></html>
diff --git a/scripts/097b500d.vendor.js b/scripts/097b500d.vendor.js
diff --git a/scripts/240bdf93.scripts.js b/scripts/240bdf93.scripts.js
diff --git a/scripts/87ffbb79.vendor.js b/scripts/87ffbb79.vendor.js
diff --git a/scripts/a267f149.scripts.js b/scripts/a267f149.scripts.js
diff --git a/settings/app.js b/settings/app.js
@@ -55,7 +55,7 @@ angular.module('app', ['ui.bootstrap','ui.tinymce'])
 				,autoresize_min_height: 50
 				,autoresize_max_height: 1000
 				,skin_url: 'tinymce-skin'
-				,content_css: '/styles/c6451e97.main.css' //and this right here folks is why we can't use textAngular
+				,content_css: '/styles/bcdd55ed.main.css' //and this right here folks is why we can't use textAngular
 			};
 
 			//handle save button

diff --git a/styles/049db49b.vendor.css → styles/75546422.vendor.css b/styles/049db49b.vendor.css → styles/75546422.vendor.css
diff --git a/styles/c6451e97.main.css → styles/bcdd55ed.main.css b/styles/c6451e97.main.css → styles/bcdd55ed.main.css
diff --git a/translations/message/en.json b/translations/message/en.json
@@ -0,0 +1,9 @@
+{
+	"message": {
+		"VN_ADD_TO_CART_SUCCESS": "Item(s) are added to your cart",
+		"VN_ADD_TO_CART_ERROR"  : "ERROR!",
+		"VN_ADD_TO_CART_WARNING": "Warning!",
+
+		"VN_UNKNOWN" 			: "Unknown server error"
+	}
+}
diff --git a/views/partials/header.html b/views/partials/header.html
@@ -1 +1,4 @@
-<nav class="navbar navbar-default navbar-fixed-top th-navbar" role="navigation" data-ng-show="headerState" data-ng-controller="HeaderCtrl"><div class="th-header"><div class="container"><div class="th-header__shipping-text"><div data-ng-bind-html="themeSettings.general.header.content.topPromo | legacyLinkify | html"></div></div><div class="th-header__account-menu"><ul class="nav nav-pills"><li><a legacy-link="/login.asp" data-translate="header.signIn">Sign In</a></li></ul></div></div></div><div class="container th-menu-container"><div class="row"><!-- Desktop Logo --><div class="col-md-2 hidden-xs hidden-sm"><!--TODO: cleanup html--><!--<a class="navbar-brand" ui-sref="i18n.home">--><a class="navbar-brand" href="/"><img data-ng-src="{{config.general.logoUrl }}" class="img-responsive"></a></div><!-- Sandwich Button --><div class="col-xs-3 hidden-md hidden-lg"><button type="button" class="navbar-toggle" data-ng-init="navCollapsed = true" snap-toggle="left"><span class="sr-only" data-translate="header.toggleNavigation">Toggle Navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span></button></div><!-- Mobile Logo --><div class="col-xs-6 hidden-md hidden-lg"><a class="th-navbar__logo" data-ng-href="/"><img data-ng-src="{{config.general.mobileLogoUrl }}" class="img-responsive"></a></div><div class="col-md-8 hidden-xs hidden-sm"><div class="collapse navbar-collapse" id="th-main-menu" data-ng-class="!navCollapsed && 'in'" data-ng-click="navCollapsed=true"><ul class="nav navbar-nav"><li class="dropdown nav-top-level-menu-items" data-ng-repeat="category in smartNavCategories" style=""><a class="navbar-link" data-ng-href="{{ category.url }}">{{category.name}}</a> <span><a href="#" data-ng-if="category.subCategories.length" class="dropdown-toggle th-dropdown-toggle"><span class="caret"></span></a><ul show-on-dropdown-hover class="dropdown-menu" data-ng-if="category.subCategories.length"><li data-ng-repeat="subCategory in category.subCategories"><a data-ng-href="{{ subCategory.url }}">{{subCategory.name}}</a></li></ul></span></li><li class="dropdown" data-ng-show="displaySmartNavMoreMenuItem"><a href="#" class="navbar-link" data-translate="header.smartNavMoreLinkText">More</a> <span><a href="#" class="dropdown-toggle th-dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a><ul show-on-dropdown-hover class="dropdown-menu"><li data-ng-repeat="category in smartNavMoreCategories"><a class="navbar-link" data-ng-href="{{ category.url }}">{{category.name}}</a></li></ul></span></li></ul></div></div><div class="col-xs-3 col-md-2"><div class="th-cart-summary pull-right"><div class="th-search-popout hidden-xs hidden-sm" role="search"><a id="search-toggle" type="button" class="th-search-popout__trigger" data-ng-class="{ '-position' : !showSearch }" data-ng-click="showSearch = !showSearch"><span class="glyphicon glyphicon-search"></span></a><div data-ng-show="showSearch" data-ng-include=" 'views/partials/form-search.html' "></div></div><div class="th-my-cart"><a legacy-link="{{ viewCart() }}" class="th-my-cart__link"><span class="th-my-cart__text" data-translate="header.myCart">My Bag</span> <span class="th-my-cart__number">{{ getCartItemsCount() }}</span></a></div></div></div></div></div><!-- /.container-fluid --></nav>
+<nav class="navbar navbar-default navbar-fixed-top th-navbar" role="navigation" data-ng-show="headerState" data-ng-controller="HeaderCtrl"><div class="th-header"><div class="container"><div class="th-header__shipping-text"><div data-ng-bind-html="themeSettings.general.header.content.topPromo | legacyLinkify | html"></div></div><div class="th-header__account-menu"><ul class="nav nav-pills"><li><a legacy-link="/login.asp" data-translate="header.signIn">Sign In</a></li></ul></div></div></div><div class="container th-menu-container"><div class="row"><!-- Desktop Logo --><div class="col-md-2 hidden-xs hidden-sm"><!--TODO: cleanup html--><!--<a class="navbar-brand" ui-sref="i18n.home">--><a class="navbar-brand" href="/"><img data-ng-src="{{config.general.logoUrl }}" class="img-responsive"></a></div><!-- Sandwich Button --><div class="col-xs-3 hidden-md hidden-lg"><button type="button" class="navbar-toggle" data-ng-init="navCollapsed = true" snap-toggle="left"><span class="sr-only" data-translate="header.toggleNavigation">Toggle Navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span></button></div><!-- Mobile Logo --><div class="col-xs-6 hidden-md hidden-lg"><a class="th-navbar__logo" data-ng-href="/"><img data-ng-src="{{config.general.mobileLogoUrl }}" class="img-responsive"></a></div><div class="col-md-8 hidden-xs hidden-sm"><div class="collapse navbar-collapse" id="th-main-menu" data-ng-class="!navCollapsed && 'in'" data-ng-click="navCollapsed=true"><ul class="nav navbar-nav"><li class="dropdown nav-top-level-menu-items" data-ng-repeat="category in smartNavCategories" style=""><a class="navbar-link" data-ng-href="{{ category.url }}">{{category.name}}</a> <span><a href="#" data-ng-if="category.subCategories.length" class="dropdown-toggle th-dropdown-toggle"><span class="caret"></span></a><ul show-on-dropdown-hover class="dropdown-menu" data-ng-if="category.subCategories.length"><li data-ng-repeat="subCategory in category.subCategories"><a data-ng-href="{{ subCategory.url }}">{{subCategory.name}}</a></li></ul></span></li><li class="dropdown" data-ng-show="displaySmartNavMoreMenuItem"><a href="#" class="navbar-link" data-translate="header.smartNavMoreLinkText">More</a> <span><a href="#" class="dropdown-toggle th-dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a><ul show-on-dropdown-hover class="dropdown-menu"><li data-ng-repeat="category in smartNavMoreCategories"><a class="navbar-link" data-ng-href="{{ category.url }}">{{category.name}}</a></li></ul></span></li></ul></div></div><div class="col-xs-3 col-md-2"><div class="th-cart-summary pull-right"><div class="th-search-popout hidden-xs hidden-sm" role="search"><a id="search-toggle" type="button" class="th-search-popout__trigger" data-ng-class="{ '-position' : !showSearch }" data-ng-click="showSearch = !showSearch"><span class="glyphicon glyphicon-search"></span></a><div data-ng-show="showSearch" data-ng-include=" 'views/partials/form-search.html' "></div></div><div class="th-my-cart"><a legacy-link="{{ viewCart() }}" class="th-my-cart__link"><span class="th-my-cart__text" data-translate="header.myCart">My Bag</span> <span class="th-my-cart__number">{{ getCartItemsCount() }}</span></a></div><!--
+						current AngularJS have problem with angular-ui's alert directive
+						{{ alert.type }} will be interpolated correctly but ng-class will always pick "alert-warning"
+					--><!--<div class="th-alert-container" ng-show="alert !== null">--><!--<alert type="{{ alert.type }}" close="closeAlert()">{{ alert.msg }}</alert>--><!--</div>--><div class="th-alert-container" ng-if="alert !== null && alert.type === 'success'"><alert type="success" close="closeAlert()">{{ alert.msg }}</alert></div><div class="th-alert-container" ng-if="alert !== null && alert.type === 'danger'"><alert type="danger" close="closeAlert()">{{ alert.msg }}</alert></div><div class="th-alert-container" ng-if="alert !== null && alert.type === 'warning'"><alert type="warning" close="closeAlert()">{{ alert.msg }}</alert></div></div></div></div></div><!-- /.container-fluid --></nav>