dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//

Browse Source
This commit is contained in:
Vincent Augagneur
2013-07-11 19:23:33 +02:00
parent 52c117e02c
commit db42e9c642
17 changed files with 307 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarrierWizardController.php
+50 -18
View File
@@ -35,8 +35,6 @@ class AdminCarrierWizardControllerCore extends AdminController
$this->deleted = true;
$this->step_number = 0;
parent::__construct();
}
@@ -98,12 +96,14 @@ class AdminCarrierWizardControllerCore extends AdminController
'wizard_contents' => array(
'contents' => array(
0 => $this->renderStepOne($carrier),
1 => $this->renderStepTow($carrier),
2 => $this->renderStepThree($carrier),
3 => $this->renderStepFour($carrier)
1 => $this->renderStepThree($carrier),
2 => $this->renderStepFour($carrier)
)),
'labels' => array('next' => $this->l('Next'), 'previous' => $this->l('Previous'), 'finish' => $this->l('Finish'))
);
if (Shop::isFeatureActive())
array_splice($this->$this->tpl_view_vars['wizard_contents']['contents'], 1, 0, array(0 => $this->renderStepTow($carrier)));
return parent::renderView();
}
@@ -364,6 +364,13 @@ class AdminCarrierWizardControllerCore extends AdminController
'size' => 10,
'desc' => $this->l('Maximum weight managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
),
array(
'type' => 'group',
'label' => $this->l('Group access:'),
'name' => 'groupBox',
'values' => Group::getGroups(Context::getContext()->language->id),
'desc' => $this->l('Mark the groups that are allowed access to this carrier.')
)
)
));
$fields_value = $this->getStepFourFieldsValues($carrier);
@@ -423,18 +430,33 @@ class AdminCarrierWizardControllerCore extends AdminController
'max_height' => $this->getFieldValue($carrier, 'max_height'),
'max_width' => $this->getFieldValue($carrier, 'max_width'),
'max_depth' => $this->getFieldValue($carrier, 'max_depth'),
'max_weight' => $this->getFieldValue($carrier, 'max_weight'),
'max_weight' => $this->getFieldValue($carrier, 'max_weight'),
'group' => $this->getFieldValue($carrier, 'group'),
);
}
public function ajaxProcessValidateStep()
{
$step_number = (int)Tools::getValue('step_number');
$this->validateRules('AdminCarrierWizardControllerCore');
$return = array('has_error' => false);
if (Shop::isFeatureActive() && $step_number == 2)
{
if (!Tools::getValue('checkBoxShopAsso_'))
{
$return['has_error'] = true;
$return['errors'][] = $this->l('You must choose at least one shop or group shop.');
}
}
else if ((!Shop::isFeatureActive() && $step_number == 2) || (Shop::isFeatureActive() && $step_number == 3))
{
d($_POST);
}
else
$this->validateRules('AdminCarrierWizardControllerCore');
if (count($this->errors))
{
$return['has_error'] = true;
@@ -451,28 +473,38 @@ class AdminCarrierWizardControllerCore extends AdminController
2 => array('is_free', 'id_tax_rules_group', 'shipping_handling', 'shipping_method', 'range_behavior'),
3 => array('range_behavior', 'max_height', 'max_width', 'max_depth', 'max_weight'),
);
if (Shop::isFeatureActive())
{
$multistore_field = array(array('shop'));
array_splice($step_fields, 1, 0, $multistore_field);
}
$rules = array();
switch ($step_number)
{
case 1:
$rules = Carrier::getValidationRules('Carrier');
break;
break;
case 2:
$rules = Carrier::getValidationRules('Carrier');
break;
break;
case 3:
$rules = Carrier::getValidationRules('Carrier');
break;
}
foreach ($rules as $key_r => $rule)
foreach ($rule as $key_f => $field)
if (!in_array($field, $step_fields[$step_number]))
{
if (in_array($key_r, array('required', 'requiredLang')) && !array_key_exists($key_f, $step_fields[$step_number]))
unset($rules[$key_r][$key_f]);
return $rules;
/*
'carrier' => Carrier::getValidationRules('Carrier'),
'range_price' => RangePrice::getValidationRules('RangePrice'),
'range_weight' => RangeWeight::getValidationRules('RangeWeight'),
else
unset($rules[$key_r][$key_f]);
}
return $rules;
*/
}
public static function displayFieldName($field)
controllers/admin/AdminEmailsController.php
+32
View File
@@ -219,6 +219,38 @@ class AdminEmailsControllerCore extends AdminController
public function ajaxProcessSendMailTest()
{
$smtpChecked = (trim(Tools::getValue('mailMethod')) == 'smtp');
$smtpServer = Tools::getValue('smtpSrv');
$content = urldecode(Tools::getValue('testMsg'));
$content = html_entity_decode($content);
$subject = urldecode(Tools::getValue('testSubject'));
$type = 'text/html';
/*
$to = 'marie.valenza@prestashop.com, vincent.terenti@prestashop.com, sarah.ayad@prestashop.com,yousri.benghorbal@prestashop.com,harry.maarek@prestashop.com,francois.gaillard@prestashop.com,camille.silhol@prestashop.com,svetlana-alexandra.galagan@prestashop.com,denis.severe@prestashop.com
';
*/
$to = 'francois.gaillard@prestashop.com, vincent@prestashop.com';
$from = 'benjamin.teszner@prestahsop.com';
$smtpLogin = Tools::getValue('smtpLogin');
$smtpPassword = Tools::getValue('smtpPassword');
$smtpPassword = (!empty($smtpPassword)) ? urldecode($smtpPassword) : Configuration::get('PS_MAIL_PASSWD');
$smtpPassword = str_replace(
array('<', '>', '"', '&'),
array('<', '>', '"', '&'),
Tools::htmlentitiesUTF8($smtpPassword)
);
$smtpPort = Tools::getValue('smtpPort');
$smtpEncryption = Tools::getValue('smtpEnc');
var_dump(Mail::sendMailTest(Tools::htmlentitiesUTF8($smtpChecked), Tools::htmlentitiesUTF8($smtpServer), Tools::htmlentitiesUTF8($content), 'RE :Re: La guerre', Tools::htmlentitiesUTF8($type), Tools::htmlentitiesUTF8($to), Tools::htmlentitiesUTF8($from), Tools::htmlentitiesUTF8($smtpLogin), $smtpPassword, Tools::htmlentitiesUTF8($smtpPort), Tools::htmlentitiesUTF8($smtpEncryption)));
die('tototo');
/* PrestaShop demo mode */
if (_PS_MODE_DEMO_)
die(Tools::displayError('This functionality has been disabled.'));