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

Migrate "Shop parameters > Order settings > Statuses" page #27590

Merged
merged 13 commits into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view

This file was deleted.

This file was deleted.

6 changes: 6 additions & 0 deletions admin-dev/themes/new-theme/js/app/utils/colorpicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ const {$} = window;
const init = function initDatePickers() {
$('.colorpicker input[type="text"]').each((i, picker) => {
$(picker).colorpicker();
$(picker).on('colorpickerCreate', () => {
$(picker).css('background-color', $(picker).val());
});
$(picker).on('colorpickerChange', (event) => {
$(picker).css('background-color', event.color.toString());
});
});
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,26 @@ export default class BulkActionCheckboxExtension {
* @param {Grid} grid
*/
extend(grid: Grid): void {
this.handleBulkActionCheckboxStatus(grid);
this.handleBulkActionCheckboxSelect(grid);
this.handleBulkActionSelectAllCheckbox(grid);
}

/**
* Disable/Enable "Select all" button in the grid
*
* @param {Grid} grid
*
* @private
*/
private handleBulkActionCheckboxStatus(grid: Grid) {
Progi1984 marked this conversation as resolved.
Show resolved Hide resolved
const gridBulkActionSelectAll = grid.getContainer().find(GridMap.bulks.actionSelectAll);
gridBulkActionSelectAll.prop(
'disabled',
grid.getContainer().find(GridMap.bulks.bulkActionCheckbox).length === 0,
);
}

/**
* Handles "Select all" button in the grid
*
Expand Down
6 changes: 6 additions & 0 deletions admin-dev/themes/new-theme/js/pages/order-states/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,34 @@ import ColumnTogglingExtension from '@components/grid/extension/column-toggling-
import SubmitBulkActionExtension from '@components/grid/extension/submit-bulk-action-extension';
import BulkActionCheckboxExtension from '@components/grid/extension/bulk-action-checkbox-extension';
import SubmitRowActionExtension from '@components/grid/extension/action/row/submit-row-action-extension';
import SubmitGridExtension from '@components/grid/extension/submit-grid-action-extension';
import FiltersSubmitButtonEnablerExtension from '@components/grid/extension/filters-submit-button-enabler-extension';

const {$} = window;

$(() => {
const orderStatesGrid = new Grid('order_states');

orderStatesGrid.addExtension(new FiltersResetExtension());
orderStatesGrid.addExtension(new FiltersSubmitButtonEnablerExtension());
orderStatesGrid.addExtension(new SortingExtension());
orderStatesGrid.addExtension(new ExportToSqlManagerExtension());
orderStatesGrid.addExtension(new ReloadListActionExtension());
orderStatesGrid.addExtension(new BulkActionCheckboxExtension());
orderStatesGrid.addExtension(new SubmitGridExtension());
orderStatesGrid.addExtension(new SubmitBulkActionExtension());
orderStatesGrid.addExtension(new SubmitRowActionExtension());
orderStatesGrid.addExtension(new ColumnTogglingExtension());

const orderReturnStatusesGrid = new Grid('order_return_states');

orderReturnStatusesGrid.addExtension(new FiltersResetExtension());
orderReturnStatusesGrid.addExtension(new FiltersSubmitButtonEnablerExtension());
orderReturnStatusesGrid.addExtension(new SortingExtension());
orderReturnStatusesGrid.addExtension(new ExportToSqlManagerExtension());
orderReturnStatusesGrid.addExtension(new ReloadListActionExtension());
orderReturnStatusesGrid.addExtension(new BulkActionCheckboxExtension());
orderReturnStatusesGrid.addExtension(new SubmitGridExtension());
orderReturnStatusesGrid.addExtension(new SubmitBulkActionExtension());
orderReturnStatusesGrid.addExtension(new SubmitRowActionExtension());
});
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,13 @@
&::after {
border: none;
}

.form-control {
&,
&:focus-visible,
&:focus {
color: transparent;
text-shadow: none;
}
}
}
4 changes: 0 additions & 4 deletions admin-dev/themes/new-theme/scss/components/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,6 @@ table {

td[data-column-id^="id_"] {
max-width: 8rem;

input {
Progi1984 marked this conversation as resolved.
Show resolved Hide resolved
max-width: 6rem;
}
}

td[data-column-id^="price_tax_excluded"] {
Expand Down
8 changes: 4 additions & 4 deletions admin-dev/themes/new-theme/scss/pages/_order_states.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
table#order_states_grid_table,
table#order_return_states_grid_table {
thead {
tr.column-headers {
th:first-child {
width: 130px;
tbody {
.color-type.column-name {
.badge {
font-size: inherit;
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion classes/order/OrderReturnState.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\OrderReturnStateSettings;

/**
* Copyright since 2007 PrestaShop SA and Contributors
* PrestaShop is an International Registered Trademark & Property of PrestaShop SA
Expand Down Expand Up @@ -42,7 +45,7 @@ class OrderReturnStateCore extends ObjectModel
'color' => ['type' => self::TYPE_STRING, 'validate' => 'isColor'],

/* Lang fields */
'name' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 64],
'name' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => OrderReturnStateSettings::NAME_MAX_LENGTH],
],
];

Expand Down
5 changes: 4 additions & 1 deletion classes/order/OrderState.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

use PrestaShop\PrestaShop\Core\Domain\OrderState\OrderStateSettings;

/**
* Copyright since 2007 PrestaShop SA and Contributors
* PrestaShop is an International Registered Trademark & Property of PrestaShop SA
Expand Down Expand Up @@ -91,7 +94,7 @@ class OrderStateCore extends ObjectModel
'deleted' => ['type' => self::TYPE_BOOL, 'validate' => 'isBool'],

/* Lang fields */
'name' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 64],
'name' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => OrderStateSettings::NAME_MAX_LENGTH],
'template' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isTplName', 'size' => 64],
],
];
Expand Down