Merge branches 'catalog' and 'upload_management' of https://github.com/thelia/thelia into catalog

# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
  Impemented combination creation

# By Manuel Raynaud (29) and others
# Via gmorel (6) and others
* 'upload_management' of https://github.com/thelia/thelia: (52 commits)
  Working : Upload image : Fix upload validation
  - Image format allowed - manual-reverse order on image loop
  Upload allow only for images
  Hide upload zone during upload
  Working : Upload image : Fix unit tests
  Working : Upload image : set product image form loaded via ajax, fix category, folder, content
  WIP : Upload image : set product image form loaded via ajax
  Setting tinymce
  Update uploader view Update image edit view
  Working : Upload management : on content
  Working : Upload management : on folder, category, product
  cache dataccessfunctions
  Working : Upload management : fix e.preventDefault in chrome and safari
  Working : Image management set on Category
  fire event on insert content in createmethod
  fix issue, default foler is set on content creation
  allow to create new content
  update default param of content model
  create content listener for crud management
  dispatch event in pre/post crud method for content model
  ...

Conflicts:
	templates/admin/default/product-edit.html

templates/admin/default/includes/generic-create-dialog.html

@@ -12,6 +12,8 @@ A generic modal creation dialog template. Parameters
     form_action        = The form action URL. Form is submitted when OK button is clicked
     form_enctype       = The form encoding
     form_error_message = The form error message (optional)
+
+    ok_button_id (optionnal) = the id of the OK button
 *}
 <div class="modal fade" id="{$dialog_id}" tabindex="-1" role="dialog" aria-hidden="true">
 
@@ -33,7 +35,7 @@ A generic modal creation dialog template. Parameters
 
 	            <div class="modal-footer">
 	                <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true"><span class="glyphicon glyphicon-remove"></span> {$dialog_cancel_label|default:{intl l='Cancel'}}</button>
-                    <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span> {$dialog_ok_label|default:{intl l='OK'}}</button>
+                    <button {if ! empty($ok_button_id)}id="{$ok_button_id}"{/if} type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span> {$dialog_ok_label|default:{intl l='OK'}}</button>
 	            </div>
 
             </form>

templates/admin/default/includes/image-upload-form.html

@@ -0,0 +1,33 @@
+{*
+A generic image upload form
+
+Parameters:
+    imageType       = Image type (category, product, folder, content, module)
+    parentId        = Image parent id, ex: category id
+
+*}
+
+<div class="image-manager" >
+    <form action="{url path="/admin/image/type/$imageType/$parentId/save-ajax"}" class="dropzone" id="images-dropzone" enctype="multipart/form-data">
+        <div class="fallback">
+            <input name="file" type="file" multiple />
+        </div>
+
+        <div class="btn-browse hide">
+            {intl l="Drop files to upload"}
+            <span>Or</span>
+            <button type="button" class="btn btn-info btn-upload"><span class="glyphicon glyphicon-upload"></span> {intl l="Browse files"}</button>
+        </div>
+    </form>
+
+    <div class="existing-image">
+        {include file='includes/image-upload-list-ajax.html'}
+    </div>
+
+</div>
+
+<script>
+    var imageDropZoneUrl = "{url path="/admin/image/type/$imageType/$parentId/save-ajax"}";
+    var imageListUrl = "{url path="/admin/image/type/$imageType/$parentId/list-ajax"}";
+    var imageListErrorMessage = "{intl l='Can\'t load images, please refresh this page.'}";
+</script>

templates/admin/default/includes/image-upload-list-ajax.html

@@ -0,0 +1,31 @@
+{*
+
+A generic image upload form
+
+Parameters:
+    imageType       = Image type (category, product, folder, content, module)
+    parentId        = Image parent id, ex: category id
+
+*}
+
+{ifloop rel="image"}
+    <table class="table table-striped table-condensed table-left-aligned">
+        {loop type="image" name="image" source="{$imageType}" order="manual-reverse" source_id="{$parentId}" width="200" height="100" resize_mode="borders"}
+            <tr>
+                <td>
+                    <img src="{$IMAGE_URL}" alt="{$TITLE}" class="img-thumbnail">
+                </td>
+                <td>
+                    <div class="btn-group">
+                        <a class="image-update-btn btn btn-default btn-xs" href="{url path="/admin/image/type/$imageType/$ID/update"}" data-error-message="{intl l='Please retry'}">
+                            <span class="glyphicon glyphicon-edit"></span>
+                        </a>
+                        <a class="image-delete-btn btn btn-default btn-xs" href="{url path="/admin/image/type/$imageType/delete/$ID"}" data-error-message="{intl l='Please retry'}">
+                            <span class="glyphicon glyphicon-trash"></span>
+                        </a>
+                    </div>
+                <td>
+            </tr>
+        {/loop}
+    </table>
+{/ifloop}

templates/admin/default/includes/product-details-tab.html

@@ -37,6 +37,10 @@
             {/form_field}
         {/loop}
 
+        <p class="title title-without-tabs">{intl l='Default pricing'}</p>
+
+        <p>{intl l="The default pricing is used with product that do not have any combinations. It is also used for product with combinations which share the same pricing information"}</p>
+
 	    <div class="row">
 
 	        {* -- Pricing ------------------------------------------------------- *}
@@ -173,81 +177,193 @@
 
     {* -- Attribute combinations -------------------------------------------- *}
 
-    <div class="row">
-        <div class="col-md-12">
+    {module_include location='product_before_combinations'}
 
-            <p class="title title-without-tabs">{intl l='Attribute Combinations'}</p>
+	<div class="row">
+	    <div class="col-md-12">
+            <div class="well well-sm">
 
-            {module_include location='product_before_combinations'}
+				<table class="table table-striped table-condensed" id="category_list">
+				    <caption>
+				        {intl l='Attribute Combinations'}
 
-            {ifloop rel="product-attributes"}
-            <form method="POST" action="{url path='/admin/products/combinations/save'}" {form_enctype form=$form} class="clearfix">
-                <div class="well well-sm">
-                   <p class="title title-without-tabs">{intl l='Create a new combination'}</p>
+				        {module_include location='product_combinations_list_caption'}
 
-				   <div class="form-group">
-				       <label class="control-label">{intl l="Attribute"} : </label>
-				       <select required="required" name="attribute_id" id="attribute_id" class="form-control">
-					       <option value="">{intl l='Select an attribute...'}</option>
-					       {loop name="product-attributes" type="attribute" product=$product_id backend_context="1" lang=$edit_language_id}
-					           <option value="{$ID}">{$TITLE}</option>
-					       {/loop}
-					   </select>
-					   <span class="help-block">{intl l='Select an attribute and click (+) to view available values'}</span>
-					</div>
+				        {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.products.update"}
+				        <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new combination'}" href="#combination_creation_dialog" data-toggle="modal">
+				            <span class="glyphicon glyphicon-plus-sign"></span>
+				        </a>
+				        {/loop}
+				    </caption>
+
+				    <thead>
+				        <tr>
+				            <th>{intl l='Attributes'}</th>
+							<th class="text-center">{intl l='Quantity'}</th>
+							<th class="text-center">{intl l='Price<br />w/o taxes (%currency)' currency=$currency_symbol}</th>
+							<th class="text-center">{intl l='Price<br />w/ taxes (%currency)' currency=$currency_symbol}</th>
+							<th class="text-center">{intl l='Weight (Kg)'}</th>
+							<th class="text-center">{intl l='Is new'}</th>
+							<th class="text-center">{intl l='On sale'}</th>
+							<th class="text-center">{intl l='Sale price<br />w/o taxes (%currency)' currency=$currency_symbol}</th>
+							<th class="text-center">{intl l='Sale price<br />w/ taxes (%currency)' currency=$currency_symbol}</th>
+							<th class="actions">{intl l='Actions'}</th>
+				        </tr>
+				    </thead>
+
+				    <tbody>
+                        {loop name="product.sales.elements" type="product_sale_elements" product=$product_id currency=$edit_currency_id}
+				        <tr>
+							<td>
+							{loop name="product.sales.elements.combinations" type="attribute_combination" product_sale_elements=$ID}
+							    {$ATTRIBUTE_TITLE}&nbsp;
+							{/loop}
+							</td>
+
+							<td><input class="form-control text-right" type="text" name="quantity[{$ID}]" value="{format_number number=$QUANTITY}" /></td>
+							<td><input class="form-control text-right" type="text" name="price_wo_taxes[{$ID}]" value="{format_number number=$PRICE_TAX}" /></td>
+							<td><input class="form-control text-right" type="text" name="price_w_taxes[{$ID}]" value="{format_number number=$TAXED_PRICE}" /></td>
+							<td><input class="form-control text-right" type="text" name="weight[{$ID}]" value="{format_number number=$WEIGHT}" /></td>
+
+							<td>
+							    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+							        <input class="change-default" type="radio" name="on_sale[{$ID}]" value="{$ID}" {if $IS_PROMO}checked="checked"{/if}/>
+							    </div>
+							</td>
+
+							<td>
+							 <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+							     <input class="change-default" type="radio" name="is_new[{$ID}]" value="{$ID}" {if $IS_NEW}checked="checked"{/if}/>
+							 </div>
+							</td>
+
+							<td><input class="form-control text-right" type="text" name="sale_price_wo_taxes[{$ID}]" value="{format_number number=$PROMO_PRICE_TAX}" /></td>
+							<td><input class="form-control text-right" type="text" name="sale_price_w_taxes[{$ID}]" value="{format_number number=$TAXED_PROMO_PRICE}" /></td>
+
+							<td class="actions">
+							    <a class="btn btn-default btn-xs combination-delete" title="{intl l='Delete this combination'}"  href="#combination_delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+							</td>
+				        </tr>
+                        {/loop}
+				    </tbody>
+				</table>
+			</div>
+		 </div>
+	</div>
+
+	{module_include location='product_after_combinations'}
+</div>
+
+{* -- Adding a new combination ------------------------------------------------- *}
+
+{* Capture the dialog body, to pass it to the generic dialog *}
+
+{capture "combination_creation_dialog"}
+
+    <input type="hidden" name="product_id" value="{$product_id}" />
+    <input type="hidden" name="current_tab" value="details" />
+
+	<div class="form-group">
+	   <label class="control-label">{intl l="Attribute"} : </label>
+	   <select  name="attribute_id" id="attribute_id" class="form-control">
+	       <option value="">{intl l='Select an attribute...'}</option>
+	       {loop name="product-attributes" type="attribute" product=$product_id backend_context="1" lang=$edit_language_id}
+	           <option value="{$ID}">{$TITLE}</option>
+	       {/loop}
+	   </select>
+	   <span class="help-block">{intl l='Select an attribute and click (+) to view available values'}</span>
+	</div>
 
 
-					<div id="attribute_value_selector" class="hide">
-					    <div class="input-group">
-					        {* <label class="control-label">{intl l="Attribute values"} : </label> *}
+	<div id="attribute_value_selector" class="hide">
+	    <div class="input-group">
+	        {* <label class="control-label">{intl l="Attribute values"} : </label> *}
 
-					        <select required="required" name="attribute_value_id" id="attribute_value_id" class="form-control">
-					            <option value="">{intl l='Select an attribute value...'}</option>
-					        </select>
+	        <select rname="attribute_value_id" id="attribute_value_id" class="form-control">
+	            <option value="">{intl l='Select an attribute value...'}</option>
+	        </select>
 
-					        <span class="input-group-btn" id="add_attr_value_button">
-					           <button class="btn btn-default btn-primary action-btn add-value-to-combination" type="button"><span class="glyphicon glyphicon-plus-sign"></span></button>
-					        </span>
-					    </div>
+	        <span class="input-group-btn" id="add_attr_value_button">
+	           <button class="btn btn-default btn-primary action-btn add-value-to-combination" type="button"><span class="glyphicon glyphicon-plus-sign"></span></button>
+	        </span>
+	    </div>
 
-					    <span class="help-block">{intl l='Select a value click (+) to add it to the combination'}</span>
-					</div>
+	    <span class="help-block">{intl l='Select a value click (+) to add it to the combination'}</span>
+	</div>
 
-                    <div id="attribute_value_selector_empty" class="hide">
-                        <div class="alert alert-info">
-                           {intl l="No available value for this attribute"}
-                       </div>
-                    </div>
+	<div id="attribute_value_selector_empty" class="hide">
+	    <div class="alert alert-info">
+	       {intl l="No available value for this attribute"}
+	   </div>
+	</div>
 
-                    <div class="form-group">
-                        <div class="alert alert-danger hide" id="combination_attributes_error"></div>
+	<div class="form-group">
+	    <div class="alert alert-danger hide" id="combination_attributes_error"></div>
 
-                        <select multiple="multiple" size="5" name="combination_attributes" id="combination_attributes" class="form-control">
-                        </select>
+	    <select required="required" multiple="multiple" size="5" name="combination_attributes[]" id="combination_attributes" class="form-control">
+	    </select>
 
-                        <div class="help-block">
-                            {intl l='To remove a value from the combination, select it and click "remove"'}
+	    <div class="help-block">
+	        {intl l='To remove a value from the combination, select it and click "remove"'}
 
-		                    <div class="pull-right">
-		                        <button class="btn btn-info btn-xs remove-value-from-combination" type="button">
-		                            {intl l="Remove selected value"} <span class="glyphicon glyphicon-minus-sign"></span>
-		                        </button>
-		                    </div>
-                        </div>
-                    </div>
+	        <div class="pull-right">
+	            <button class="btn btn-info btn-xs remove-value-from-combination" type="button">
+	                {intl l="Remove selected values"} <span class="glyphicon glyphicon-minus-sign"></span>
+	            </button>
+	        </div>
+	    </div>
+	</div>
 
-                </div>
-	        </form>
-            {/ifloop}
+    {form_field form=$form field='isnew'}
+    <div class="form-group {if $error}has-error{/if}">
+        <div class="checkbox">
+            <label>
+                <input type="checkbox" id="use_default_princing" name="use_default_princing" value="1">
+                {intl l="Use default princing for this combination (you can change this later)"}
+            </label>
+        </div>
+    </div>
+    {/form_field}
 
-                {elseloop rel="product-attributes"}
-		            <div class="alert alert-info">
-		                {intl l="No attributes are attached to this product."}
-		            </div>
-                {/elseloop}
+{/capture}
 
- 	            {module_include location='product_after_combinations'}
+{include
+    file = "includes/generic-create-dialog.html"
 
-	    </div> {* com *}
-	</div> {* row *}
-</div>
+    dialog_id    = "combination_creation_dialog"
+    dialog_title = {intl l="Create a new combination"}
+    dialog_body  = {$smarty.capture.combination_creation_dialog nofilter}
+
+    dialog_ok_label     = {intl l="Create this combination"}
+
+    form_action        = {url path='/admin/product/combination/add'}
+    form_enctype       = ''
+    form_error_message = ''
+
+    ok_button_id = "combination_creation_dialog_ok"
+}
+
+
+{* -- Delete combination confirmation dialog ----------------------------------- *}
+
+{capture "combination_delete_dialog"}
+
+    <input type="hidden" name="product_id" value="{$product_id}" />
+    <input type="hidden" name="current_tab" value="details" />
+
+    <input type="hidden" name="combination_id" id="combination_delete_id" value="" />
+
+    {module_include location='category_delete_form'}
+
+{/capture}
+
+{include
+    file = "includes/generic-confirm-dialog.html"
+
+    dialog_id       = "combination_delete_dialog"
+    dialog_title    = {intl l="Delete a combunation"}
+    dialog_message  = {intl l="Do you really want to delete this combination ?"}
+
+    form_action         = {url path='/admin/product/combination/delete'}
+    form_content        = {$smarty.capture.combination_delete_dialog nofilter}
+}