Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduced bulk edition on combinations #5549

Conversation

@mickaelandrieu
Copy link
Member

commented May 12, 2016

Questions Answers
Branch? develop
Description? This contribution add a way to manage update on multiples combinations linked to a product
Type? new feature
Category? Back Office
BC breaks? no
Deprecations? no
Fixed ticket? http://forge.prestashop.com/browse/BOOM-469
How to test? Select some combinations using checkboxes, use the bulk actions form to apply some new data. Also, you can delete combinations using "delete combinations" buttons.

bulk_combinations

  • Edition of combinations OK
  • Deletion of combinations OK
  • bulk checkboxes toggle OK
  • Image input (behavior need to be defined)
@mickaelandrieu mickaelandrieu added the WIP label May 12, 2016
@mickaelandrieu mickaelandrieu force-pushed the mickaelandrieu:boom-469-bulk-edition-on-combinations branch 4 times, most recently May 12, 2016
@Shudrum
Shudrum reviewed May 12, 2016
View changes
admin-dev/themes/default/js/bundle/product/product-bulk-combinations.js Outdated
};
})();

class Combination {

This comment has been minimized.

Copy link
@Shudrum

Shudrum May 12, 2016

Contributor

I don't think this file is bundle into WebPack with the Babel plugin…

@Shudrum
Shudrum reviewed May 12, 2016
View changes
src/PrestaShopBundle/Controller/Admin/ProductController.php Outdated
@@ -385,6 +385,11 @@ public function formAction($id, Request $request)
->add('step6', 'PrestaShopBundle\Form\Admin\Product\ProductOptions')
->getForm();

$formBulkCombinations = $this->createForm('PrestaShopBundle\Form\Admin\Product\ProductCombinationBulk', null, [

This comment has been minimized.

Copy link
@Shudrum

Shudrum May 12, 2016

Contributor

Now we use array(only.

This comment has been minimized.

Copy link
@mickaelandrieu

mickaelandrieu May 12, 2016

Author Member

done

@Shudrum
Shudrum reviewed May 12, 2016
View changes
src/PrestaShopBundle/Form/Admin/Product/ProductCombinationBulk.php Outdated
$resolver->setDefaults(array(
'validation_groups' => false,
'iso_code' => '',
'price_display_precision' => ''

This comment has been minimized.

Copy link
@Shudrum

Shudrum May 12, 2016

Contributor

Missed that one coma ^^

This comment has been minimized.

Copy link
@mickaelandrieu

mickaelandrieu May 12, 2016

Author Member

done

<b>{{ trans('Bulk actions', {}, 'AdminProducts') }}</b>
<i class="material-icons pull-right">keyboard_arrow_down</i>
</p>
<div class="col-md-12 collapse" style="border:2px solid #bbcdd2;" id="bulk-combinations-container">

This comment has been minimized.

Copy link
@Shudrum

Shudrum May 12, 2016

Contributor

The style should not be here.

Maybe a PrestaShopUI Kit should be added, or a specific component on the SCSS.

This comment has been minimized.

Copy link
@mickaelandrieu

mickaelandrieu May 12, 2016

Author Member

note the final design is not part of this pull request, I prefer the inline css here because it will be more easy for @nihco2 to remove it. Do you want me to remove it ?

@Shudrum
Shudrum reviewed May 12, 2016
View changes
src/PrestaShopBundle/Resources/views/Admin/Product/form.html.twig Outdated
@@ -1010,6 +1010,7 @@
<script src="{{ asset('themes/default/js/bundle/product/product-category-tags.js') }}"></script>
<script src="{{ asset('themes/default/js/bundle/product/default-category.js') }}"></script>
<script src="{{ asset('themes/default/js/bundle/product/product-combinations.js') }}"></script>
<script src="{{ asset('themes/default/js/bundle/product/product-bulk-combinations.js') }}"></script>

This comment has been minimized.

Copy link
@Shudrum

Shudrum May 12, 2016

Contributor

Yep, the class will not work.

@Shudrum
Shudrum reviewed May 12, 2016
View changes
src/PrestaShopBundle/Resources/views/Admin/Product/form_combinations_bulk.html.twig Outdated
@@ -0,0 +1,70 @@
{{ form_start(form, {'action': '#', 'method': 'GET'}) }}
<div class="col-md-12">
<div class="col-md-2">

This comment has been minimized.

Copy link
@Shudrum

Shudrum May 12, 2016

Contributor

To use a col-md-x on another col-md-x, you need to re-set a row:

<div class="col-md-12">
  <div class="row">
    <div class="col-md-2">
    </div>
  </div>
</div>

This comment has been minimized.

Copy link
@mickaelandrieu

mickaelandrieu May 12, 2016

Author Member

wow, I don't want to create a complete tree of div only to re order few blocks !
Do we have alternative "clean" solution ?

This comment has been minimized.

Copy link
@mickaelandrieu

mickaelandrieu May 12, 2016

Author Member

I've changed, replacing the first "col-md-12" by "row". Thank you for noticing me :)

@mickaelandrieu mickaelandrieu force-pushed the mickaelandrieu:boom-469-bulk-edition-on-combinations branch 3 times, most recently May 12, 2016
@mickaelandrieu mickaelandrieu removed the WIP label May 12, 2016
@mickaelandrieu
mickaelandrieu reviewed May 12, 2016
View changes
src/PrestaShopBundle/Resources/views/Admin/Product/form_combinations_bulk.html.twig Outdated
@@ -1,4 +1,4 @@
{{ form_start(form, {'action': '#', 'method': 'GET'}) }}

This comment has been minimized.

Copy link
@mickaelandrieu

mickaelandrieu May 12, 2016

Author Member

@Shudrum couldnt keep a real form to preserve footer :/

@mickaelandrieu mickaelandrieu force-pushed the mickaelandrieu:boom-469-bulk-edition-on-combinations branch May 12, 2016
@vTerenti

This comment has been minimized.

Copy link
Contributor

commented May 12, 2016

QA OK

@vTerenti vTerenti added the QA ✔️ label May 12, 2016
@Shudrum

This comment has been minimized.

Copy link
Contributor

commented May 13, 2016

👍 We just need to add the script into WebPack before merging this PR. I'm on it.

@mickaelandrieu mickaelandrieu force-pushed the mickaelandrieu:boom-469-bulk-edition-on-combinations branch 4 times, most recently May 20, 2016
@mickaelandrieu mickaelandrieu force-pushed the mickaelandrieu:boom-469-bulk-edition-on-combinations branch to 8cb21f1 May 23, 2016
@maximebiloe maximebiloe merged commit 88039bd into PrestaShop:develop May 24, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@mickaelandrieu mickaelandrieu deleted the mickaelandrieu:boom-469-bulk-edition-on-combinations branch May 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.