Merge pull request #15 from tulimaki/various-fixes-based-on-qa

Add to basket and styles fixes
shuup · Aug 26, 2016 · 220235e · 220235e
2 parents 7606a0a + dc05c94
commit 220235e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 if __name__ == '__main__':
     setuptools.setup(
         name="shuup_megastore_theme",
-        version="1.0.6",
+        version="1.0.7",
         description="Shuup Megastore Theme",
         packages=setuptools.find_packages(),
         include_package_data=True,

diff --git a/shuup_megastore_theme/generated_resources.txt b/shuup_megastore_theme/generated_resources.txt
@@ -1,4 +1,4 @@
-static/shuup_megastore_theme/css/style.css
+static/shuup_megastore_theme/css/shuup_megastore_theme.css
 static/shuup_megastore_theme/fonts/FontAwesome.otf
 static/shuup_megastore_theme/fonts/fontawesome-webfont.eot
 static/shuup_megastore_theme/fonts/fontawesome-webfont.svg

diff --git a/shuup_megastore_theme/gulpfile.js b/shuup_megastore_theme/gulpfile.js
@@ -16,7 +16,7 @@ gulp.task("less", function() {
         .pipe(less().on("error", function() {
             this.emit("end");
         }))
-        .pipe(concat("style.css"))
+        .pipe(concat("shuup_megastore_theme.css"))
         .pipe((PRODUCTION ? minifycss() : gutil.noop()))
         .pipe(gulp.dest("static/shuup_megastore_theme/css/"));
 });

diff --git a/shuup_megastore_theme/templates/shuup_megastore_theme/shuup/front/base.jinja b/shuup_megastore_theme/templates/shuup_megastore_theme/shuup/front/base.jinja
@@ -18,7 +18,7 @@
     <link rel="icon" type="image/x-icon" href="{{ static("shuup_megastore_theme/img/favicon.ico") }}">
     <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Oswald:400,300,700|Open+Sans:400,600">
     <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:400,300,500">
-    <link rel="stylesheet" type="text/css" href="{{ static("shuup_megastore_theme/css/style.css") }}">
+    <link rel="stylesheet" type="text/css" href="{{ static("shuup_megastore_theme/css/shuup_megastore_theme.css") }}?v=0.0.1">
 </head>
 <body>
     <div class="content-wrap">
@@ -60,8 +60,8 @@
         </div>
         {{ render_footer() }}
     </div>
-    <script src="{{ static("shuup/front/js/scripts.js") }}"></script>
-    <script src="{{ static("shuup_megastore_theme/js/shuup_megastore_theme.js") }}"></script>
+    <script src="{{ static("shuup/front/js/scripts.js") }}"?v=0.0.1"></script>
+    <script src="{{ static("shuup_megastore_theme/js/shuup_megastore_theme.js") }}?v=0.0.1"></script>
 
     {% block extrajs %}{% endblock %}
     {{ add_product_to_cart() }}

diff --git a/..._theme/templates/shuup_megastore_theme/shuup/front/basket/navigation_basket_partial.jinja b/..._theme/templates/shuup_megastore_theme/shuup/front/basket/navigation_basket_partial.jinja
@@ -0,0 +1,2 @@
+{%- from "shuup/front/macros/navigation.jinja" import render_basket_partial with context -%}
+{{ render_basket_partial(request.basket, id="navigation-basket-partial") }}
diff --git a/...egastore_theme/templates/shuup_megastore_theme/shuup/front/macros/theme/add_to_cart.jinja b/...egastore_theme/templates/shuup_megastore_theme/shuup/front/macros/theme/add_to_cart.jinja
@@ -1,4 +1,4 @@
-{% macro add_product_to_basket(main_class="cart-indicator") %}
+{% macro add_product_to_cart(main_class="cart-indicator") %}
     <div class="cart-indicator" id="cart-indicator">
         <div class="success-msg">
             <i class="fa fa-check"></i>
@@ -19,6 +19,7 @@
                 url: "{{ url('shuup:xtheme_extra_view', view='basket_partial') }}",
                 method: "GET",
                 success: function(basket_html) {
+                    console.log(basket_html);
                     $("#navigation-basket-partial").replaceWith(basket_html);
                 }
             });
@@ -43,7 +44,7 @@
                         handleError(cover);
                         return;
                     }
-                    updateNavigationBasket();
+                    window.updateNavigationBasket();
                     cover.addClass("success");
                     setTimeout(function() {
                         // Hide the message
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{%- from "shuup/front/macros/navigation.jinja" import render_basket_partial with context -%}
		{{ render_basket_partial(request.basket, id="navigation-basket-partial") }}