Skip to content

fix(api): preserve null in Manager API payload field updates (#289) #295

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.

Sign up for GitHub

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

Open
Ibochkarev wants to merge 1 commit into
base: beta
Choose a base branch
from
+14 −7
Open

fix(api): preserve null in Manager API payload field updates (#289) #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions core/components/minishop3/src/Controllers/Api/Manager/OrdersController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ public function create(array $params = []): array
'comment', 'text_address'
];
foreach ($addressFields as $field) {
if (isset($params[$field])) {
if (array_key_exists($field, $params)) {
$address->set($field, $params[$field]);
}
}
Expand Down Expand Up @@ -1146,7 +1146,7 @@ public function updateProduct(array $params = []): array
$changes = [];

foreach ($allowedFields as $field) {
if (isset($params[$field])) {
if (array_key_exists($field, $params)) {
$oldValue = $orderProduct->get($field);
$value = $params[$field];

Expand All @@ -1160,9 +1160,11 @@ public function updateProduct(array $params = []): array
$value = max(0, (float)$value);
}

// Handle options (JSON)
if ($field === 'options' && is_array($value)) {
$value = json_encode($value, JSON_UNESCAPED_UNICODE);
// Handle options (JSON); null clears options (OrderView getOptionsForSave())
if ($field === 'options') {
if (is_array($value)) {
$value = json_encode($value, JSON_UNESCAPED_UNICODE);
}
}

// Track changes for logging
Expand Down
7 changes: 6 additions & 1 deletion core/components/minishop3/src/Services/Customer/CustomerAddressManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,12 @@ public function update(int $addressId, int $customerId, array $data): bool
}

// Regenerate hash if address changed
if (isset($data['city']) || isset($data['street']) || isset($data['building']) || isset($data['room'])) {
if (
array_key_exists('city', $data)
|| array_key_exists('street', $data)
|| array_key_exists('building', $data)
|| array_key_exists('room', $data)
) {
$address->set('hash', $this->generateHash(array_merge($address->toArray(), $data)));
}

Expand Down
2 changes: 1 addition & 1 deletion core/components/minishop3/src/Services/ExtraFieldsService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ public function updateField(int $id, array $data): array
$allowedFields = ['label', 'description', 'xtype', 'active', 'select_options'];

foreach ($allowedFields as $fieldName) {
if (isset($data[$fieldName])) {
if (array_key_exists($fieldName, $data)) {
$field->set($fieldName, $data[$fieldName]);
}
}
Expand Down