Merge branch '1.7.3.x' into merge-173x

# Conflicts: # composer.json # src/PrestaShopBundle/Resources/views/Admin/Product/catalog.html.twig # src/PrestaShopBundle/Service/Hook/HookEvent.php
timactive · Dec 19, 2017 · bcdb8ee · bcdb8ee
2 parents 26e9e56 + d47b888
commit bcdb8ee
Show file tree

Hide file tree

Showing 69 changed files with 2,399 additions and 805 deletions.
diff --git a/.gitignore b/.gitignore
@@ -207,7 +207,7 @@ crashlytics-build.properties
 
 ### NetBeans ###
 nbproject/private/
-build/
+/build/
 nbbuild/
 dist/
 nbdist/
@@ -220,3 +220,7 @@ nb-configuration.xml
 .project
 .settings/
 .externalToolBuilders/
+
+### Release creation ###
+tools/build/releases/*
+!tools/build/releases/.gitkeep
diff --git a/admin-dev/themes/default/js/bundle/product/form.js b/admin-dev/themes/default/js/bundle/product/form.js
@@ -789,7 +789,7 @@ var warehouseCombinations = (function() {
       // toggle all button action
       $(document).on('click', 'div[id^="warehouse_combination_"] button.check_all_warehouse', function() {
         var checkboxes = $(this).closest('div[id^="warehouse_combination_"]').find('input[type="checkbox"][id$="_activated"]');
-        checkboxes.prop('checked', checkboxes.filter(':checked').size() === 0);
+        checkboxes.prop('checked', checkboxes.filter(':checked').length === 0);
       });
       // location disablation depending on 'stored' checkbox
       $(document).on('change', 'div[id^="warehouse_combination_"] input[id^="form_step4_warehouse_combination_"][id$="_activated"]', function() {
@@ -810,7 +810,7 @@ var warehouseCombinations = (function() {
       });
     },
     'refresh': function() {
-      var show = $('input#form_step3_advanced_stock_management:checked').size() > 0;
+      var show = $('input#form_step3_advanced_stock_management:checked').length > 0;
       if (show) {
         var url = collectionHolder.attr('data-url').replace(/\/\d+(?=\?.*)/, '/' + id_product);
         $.ajax({

diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl
@@ -68,7 +68,7 @@
 						<input name="passwd" type="password" id="passwd" class="form-control" value="{if isset($password)}{$password|escape:'html':'UTF-8'}{/if}" tabindex="2" placeholder="&#xf084 {l s='Password'}" />
 					</div>
 					<div class="form-group row-padding-top">
-						<button name="submitLogin" type="submit" tabindex="4" class="btn btn-primary btn-lg btn-block ladda-button" data-style="slide-up" data-spinner-color="white" >
+						<button id="submit_login" name="submitLogin" type="submit" tabindex="4" class="btn btn-primary btn-lg btn-block ladda-button" data-style="slide-up" data-spinner-color="white" >
 							<span class="ladda-label">
 								{l s='Log in' d='Admin.Login.Feature'}
 							</span>

diff --git a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
@@ -209,7 +209,7 @@
 	</td>
 	<td class="product_action text-right">
 		{* edit/delete controls *}
-		<div class="btn-group">
+		<div class="btn-group" id="btn_group_action">
 			<button type="button" class="btn btn-default edit_product_change_link">
 				<i class="icon-pencil"></i>
 				{l s='Edit' d='Admin.Actions'}

diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -499,7 +499,7 @@
             html += '<span class="text-muted">' + ((this.birthday != '0000-00-00') ? this.birthday : '') + '</span><br/>';
             html += '<div class="panel-footer">';
             html += '<a href="{$link->getAdminLink('AdminCustomers')}&id_customer=' + this.id_customer + '&viewcustomer&liteDisplaying=1" class="btn btn-default fancybox"><i class="icon-search"></i> {l s='Details' d='Admin.Global'}</a>';
-            html += '<button type="button" data-customer="' + this.id_customer + '" class="setup-customer btn btn-default pull-right"><i class="icon-arrow-right"></i> {l s='Choose' d='Admin.Actions'}</button>';
+            html += '<button type="button" data-customer="' + this.id_customer + '" class="setup-customer btn btn-default pull-right" id="choose_customer_btn"><i class="icon-arrow-right"></i> {l s='Choose' d='Admin.Actions'}</button>';
             html += '</div>';
             html += '</div>';
             html += '</div>';
@@ -1568,7 +1568,7 @@
 				</div>
 				<div class="form-group">
 					<div class="col-lg-9 col-lg-offset-3">
-						<button type="submit" name="submitAddOrder" class="btn btn-default" />
+						<button type="submit" name="submitAddOrder" {if $table}id="{$table}_submit_btn"{/if} class="btn btn-default" />
 							<i class="icon-check"></i>
 							{l s='Create the order' d='Admin.Orderscustomers.Feature'}
 						</button>

diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -250,7 +250,7 @@
                   <input type="hidden" name="id_order" value="{$order->id}" />
                 </div>
                 <div class="col-lg-3">
-                  <button type="submit" name="submitState" class="btn btn-primary">
+                  <button type="submit" name="submitState" id="submit_state" class="btn btn-primary">
                     {l s='Update status' d='Admin.Orderscustomers.Feature'}
                   </button>
                 </div>

diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -848,7 +848,7 @@
 						</button>
 						{/if}
 						{if isset($show_cancel_button) && $show_cancel_button}
-						<a href="{$back_url|escape:'html':'UTF-8'}" class="btn btn-default" onclick="window.history.back();">
+						<a href="{$back_url|escape:'html':'UTF-8'}" class="btn btn-default" {if $table}id="{$table}_form_cancel_btn"{/if} onclick="window.history.back();">
 							<i class="process-icon-cancel"></i> {l s='Cancel' d='Admin.Actions'}
 						</a>
 						{/if}

diff --git a/admin-dev/themes/default/template/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
@@ -28,7 +28,7 @@
 	<div class="col-lg-6">
 		{if $bulk_actions && $has_bulk_actions}
 		<div class="btn-group bulk-actions dropup">
-			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" {if $table}id="bulk_action_menu_{$table}"{/if}>
 				{l s='Bulk actions' d='Admin.Global'} <span class="caret"></span>
 			</button>
 			<ul class="dropdown-menu">

diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -245,7 +245,7 @@
 
 	{block name="preTable"}{/block}
 	<div class="table-responsive-row clearfix{if isset($use_overflow) && $use_overflow} overflow-y{/if}">
-		<table{if $table_id} id="table-{$table_id}"{/if} class="table{if $table_dnd} tableDnD{/if} {$table}" >
+		<table id="table-{if $table_id}{$table_id}{elseif $table}{$table}{/if}" class="table{if $table_dnd} tableDnD{/if} {$table}" >
 			<thead>
 				<tr class="nodrag nodrop">
 					{if $bulk_actions && $has_bulk_actions}

diff --git a/admin-dev/themes/default/template/page_header_toolbar.tpl b/admin-dev/themes/default/template/page_header_toolbar.tpl
@@ -139,7 +139,7 @@
       </div>
     {/block}
     {if isset($current_tab_level) && $current_tab_level == 3}
-      <div class="page-head-tabs">
+      <div class="page-head-tabs" id="head_tabs">
         {foreach $tabs as $level_1}
           {foreach $level_1.sub_tabs as $level_2}
             {foreach $level_2.sub_tabs as $level_3}

diff --git a/admin-dev/themes/new-theme/js/clickable-dropdown.js b/admin-dev/themes/new-theme/js/clickable-dropdown.js
@@ -0,0 +1,47 @@
+/*
+ * 2007-2017 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2017 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ *
+ */
+
+/**
+ * By default, bootstrap dropdowns close down when the user clicks anywhere.
+ * This plugin allows clicking inside the dropdown menu while keeping it open.
+ * In order to make a dropdown behave like this, simply add the class "dropdown-clickable" to its parent element.
+ */
+(($) => {
+
+  $.fn.clickableDropdown = function clickableDropdown() {
+
+    $(document).on('click', '.dropdown-clickable .dropdown-menu', (e) => {
+      e.stopPropagation();
+    });
+
+    return this;
+  };
+
+  // hook up the plugin
+  $(function initClickableDropdown() {
+    $(document).clickableDropdown();
+  });
+})(window.$);
diff --git a/admin-dev/themes/new-theme/js/header.js b/admin-dev/themes/new-theme/js/header.js
@@ -100,22 +100,10 @@ export default class Header {
   }
 
   initNotificationsToggle() {
-    // Part of the notif dropdown's behavior is handled manually to prevent it to get closed when navigating its tabs
-    $('#notif').on({
-      'shown.bs.dropdown': function() {
-        $(this).data('closable', false);
-      },
-      'hide.bs.dropdown': function () {
-        return $(this).data('closable') === true;
-      }
-    });
-
     $('.notification.dropdown-toggle').on('click', () => {
       if(!$('.mobile-nav').hasClass('expanded')) {
         this.updateEmployeeNotifications();
       }
-
-      $('#notif').data('closable', true );
     });
 
     $('body').on('click', function (e) {
@@ -128,8 +116,6 @@ export default class Header {
           $('.mobile-layer').removeClass('expanded');
           refreshNotifications();
         }
-
-        $('#notif').data('closable', true);
       }
     });
 

diff --git a/admin-dev/themes/new-theme/js/theme.js b/admin-dev/themes/new-theme/js/theme.js
@@ -39,6 +39,9 @@ Dropzone.autoDiscover = false;
 
 import NavBar from './nav_bar.js';
 
+// this needs to be ported into the UI kit
+import './clickable-dropdown';
+
 import './product-page/index';
 import './translation-page/index';