Skip to content

Commit

Permalink
compatible with quick checkout
Browse files Browse the repository at this point in the history
  • Loading branch information
@Reza1607
Reza1607 committed Oct 1, 2015
1 parent d0b6979 commit 6cdbc5a
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 10 deletions.
15 changes: 15 additions & 0 deletions admin/controller/payment/frotel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ public function index()
$this->data['entry_pro_code_desc'] = $this->language->get('entry_pro_code_desc');
$this->data['entry_geo_zone'] = $this->language->get('entry_geo_zone');

$this->data['entry_default_payment'] = $this->language->get('entry_default_payment');
$this->data['entry_default_delivery'] = $this->language->get('entry_default_delivery');

/* text and button and form */
$this->data['button_save'] = $this->language->get('button_save');
$this->data['button_cancel'] = $this->language->get('button_cancel');
Expand Down Expand Up @@ -164,6 +167,18 @@ public function index()
$this->data['frotel_sort'] = $this->config->get('frotel_sort');
}

if (isset($this->request->post['frotel_default_payment'])) {
$this->data['frotel_default_payment'] = $this->request->post['frotel_default_payment'];
} else {
$this->data['frotel_default_payment'] = $this->config->get('frotel_default_payment');
}

if (isset($this->request->post['frotel_default_delivery'])) {
$this->data['frotel_default_delivery'] = $this->request->post['frotel_default_delivery'];
} else {
$this->data['frotel_default_delivery'] = $this->config->get('frotel_default_delivery');
}

if (isset($this->request->post['frotel_default_online_express'])) {
$this->data['frotel_default_online_express'] = $this->request->post['frotel_default_online_express'];
} else {
Expand Down
2 changes: 2 additions & 0 deletions admin/language/persian/payment/frotel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,5 @@
$_['text_failed_get_price'] = 'در صورت خطا در دریافت هزینه ارسال این مبلغ در نظر گرفته می شود.';
$_['error_province'] = 'شهر و استان تنظیم نشده است.';

$_['entry_default_payment'] = 'روش پرداخت پیشفرض';
$_['entry_default_delivery'] = 'روش ارسال پیشفرض';
18 changes: 18 additions & 0 deletions admin/view/template/payment/frotel.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,24 @@
<label><input type="checkbox" name="frotel_cod" <?php echo ($frotel_cod?"checked='checked'":"") ?> value="1" /><?php echo $entry_cod; ?></label><br/>
</td>
</tr>
<tr>
<td valign="top"><label for="default_payment"><?php echo $entry_default_payment; ?></label></td>
<td>
<select name="frotel_default_payment" id="default_payment">
<option value="online"<?php echo $frotel_default_payment=='online'?' selected=selected':'' ?>><?php echo $entry_online; ?></option>
<option value="cod"<?php echo $frotel_default_payment=='cod'?' selected=selected':'' ?>><?php echo $entry_cod; ?></option>
</select>
</td>
</tr>
<tr>
<td valign="top"><label for="default_delivery"><?php echo $entry_default_delivery; ?></label></td>
<td>
<select name="frotel_default_delivery" id="default_delivery">
<option value="express"<?php echo $frotel_default_delivery=='express'?' selected=selected':'' ?>><?php echo $entry_express; ?></option>
<option value="registered"<?php echo $frotel_default_delivery=='registered'?' selected=selected':'' ?>><?php echo $entry_registered; ?></option>
</select>
</td>
</tr>
<tr>
<td><label for="frotel_default_online_express"><?php echo $entry_default_online_express; ?></label></td>
<td>
Expand Down
12 changes: 8 additions & 4 deletions catalog/model/payment/frotel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ class ModelPaymentFrotel extends Model
public function getMethod($address,$total)
{
if(!isset($this->session->data['shipping_method'])) {
return false;
if ($this->config->get('frotel_default_payment') == null)
return false;

$shipping_method = $this->config->get('frotel_default_payment') . '_' . $this->config->get('frotel_default_delivery');
} else {
$shipping_method = explode('.',$this->session->data['shipping_method']['code']);
if (!isset($shipping_method[1]))
$shipping_method[1] = 'registered_online';
}

$this->load->language('payment/frotel');
$shipping_method = explode('.',$this->session->data['shipping_method']['code']);
if (!isset($shipping_method[1]))
$shipping_method[1] = 'registered_online';

$shipping_method = explode('_',$shipping_method[1]);
$delivery_type = $shipping_method[0];
Expand Down
12 changes: 6 additions & 6 deletions vqmod/xml/frotel.xml_ → vqmod/xml/zFrotel.xml_
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<author><![CDATA[ReZa ZaRe ([email protected])]]></author>
<file name="catalog/controller/checkout/checkout.php">
<operation>
<search position="before"><![CDATA[$products = $this->cart->getProducts();]]></search>
<add><![CDATA[
if (!isset($this->session->data['province_id'])) {
$this->response->redirect($this->url->link('payment/frotel/city','','SSL'));
}
]]></add>
<search position="after"><![CDATA[public function index() {]]></search>
<add><![CDATA[
if (!isset($this->session->data['province_id'])) {
$this->response->redirect($this->url->link('payment/frotel/city','','SSL'));
}
]]></add>
</operation>
</file>
<file error="skip" name="catalog/controller/quickcheckout/checkout.php">
Expand Down

0 comments on commit 6cdbc5a

Please sign in to comment.