Skip to content

Commit bc9c1f1

Browse files
J7FJ7F
authored andcommitted
PES-2876: permissions update - carrier forms permission check
1 parent c121428 commit bc9c1f1

File tree

2 files changed

+23
-5
lines changed

2 files changed

+23
-5
lines changed

packetery/controllers/admin/PacketeryCarrierGridController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,8 @@ public function renderView()
168168
$carrierHelper->build();
169169
if ($carrierHelper->getError()) {
170170
$this->errors[] = $carrierHelper->getError();
171-
} else {
172-
$this->tpl_view_vars['carrierHelper'] = $carrierHelper->getHtml();
173171
}
172+
$this->tpl_view_vars['carrierHelper'] = $carrierHelper->getHtml();
174173
}
175174
return parent::renderView();
176175
}

packetery/libs/Carrier/CarrierAdminForm.php

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Packetery\ApiCarrier\ApiCarrierRepository;
99
use Packetery\Exceptions\DatabaseException;
1010
use Packetery\Tools\MessageManager;
11+
use Packetery\Tools\PermissionHelper;
1112
use Tools;
1213

1314
class CarrierAdminForm
@@ -88,8 +89,12 @@ public function buildCarrierForm()
8889
}
8990

9091
if (Tools::isSubmit('submitCarrierForm')) {
91-
$carrierData['id_branch'] = Tools::getValue('id_branch');
92-
$this->saveCarrier($carrierData);
92+
if (!PermissionHelper::canEditCarriers()) {
93+
$this->error = $this->module->l('You do not have permission to edit carrier settings.', 'carrieradminform');
94+
} else {
95+
$carrierData['id_branch'] = Tools::getValue('id_branch');
96+
$this->saveCarrier($carrierData);
97+
}
9398
}
9499

95100
if ($carrierData['name'] === '0') {
@@ -158,7 +163,11 @@ public function buildCarrierOptionsForm()
158163
}
159164

160165
if (Tools::isSubmit('submitCarrierOptionsForm')) {
161-
$this->saveCarrierOptions($carrierData, $apiCarrier);
166+
if (!PermissionHelper::canEditCarriers()) {
167+
$this->error = $this->module->l('You do not have permission to edit carrier options.', 'carrieradminform');
168+
} else {
169+
$this->saveCarrierOptions($carrierData, $apiCarrier);
170+
}
162171
}
163172

164173
$possibleVendors = $this->getPossibleVendors($carrierData);
@@ -280,6 +289,11 @@ public function buildCarrierOptionsForm()
280289
*/
281290
public function saveCarrier(array $carrierData)
282291
{
292+
if (!PermissionHelper::canEditCarriers()) {
293+
$this->error = $this->module->l('You do not have permission to save carrier settings.', 'carrieradminform');
294+
return;
295+
}
296+
283297
$apiCarrier = $this->apiRepository->getById($carrierData['id_branch']);
284298
if (!$apiCarrier) {
285299
$this->repository->deleteById($this->carrierId);
@@ -327,6 +341,11 @@ public function saveCarrier(array $carrierData)
327341
*/
328342
public function saveCarrierOptions(array $carrierData, array $apiCarrier)
329343
{
344+
if (!PermissionHelper::canEditCarriers()) {
345+
$this->error = $this->module->l('You do not have permission to save carrier options.', 'carrieradminform');
346+
return;
347+
}
348+
330349
$formData = Tools::getAllValues();
331350
$pickupPointType = $this->getPickupPointType($apiCarrier, $carrierData['id_branch']);
332351

0 commit comments

Comments
 (0)