Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/api/Orders.php b/api/Orders.php
- index 3165115..97442ea 100755
- --- a/api/Orders.php
- +++ b/api/Orders.php
- @@ -24,7 +24,7 @@ class Orders extends Simpla
- $query = $this->db->placehold("SELECT o.id, o.delivery_id, o.delivery_price, o.separate_delivery,
- o.payment_method_id, o.paid, o.payment_date, o.closed, o.discount, o.coupon_code, o.coupon_discount,
- o.date, o.user_id, o.name, o.address, o.phone, o.email, o.comment, o.status,
- - o.url, o.total_price, o.note
- + o.url, o.total_price, o.note, o.pallada_id
- FROM __orders o $where LIMIT 1");
- if($this->db->query($query))
- diff --git "a/design/\320\241\320\270\320\274\321\204\320\276\320\275\320\270\321\217/html/cart.tpl" "b/design/\320\241\320\270\320\274\321\204\320\276\320\275\320\270\321\217/html/cart.tpl"
- index 2628989..dde41f2 100644
- --- "a/design/\320\241\320\270\320\274\321\204\320\276\320\275\320\270\321\217/html/cart.tpl"
- +++ "b/design/\320+41\320+70\320+74\321+04\320+76\320+75\320+70\321+17/html/cart.tpl"
- @@ -222,6 +222,9 @@ $("input[name='coupon_code']").keypress(function(event){
- <label>Адрес доставки</label>
- <input name="address" type="text" value="{$address|escape}"/>
- + <label>Pallada ID<br/><span style="font-size:80%">(только для участников объединения потребителей "Паллада")</span></label>
- + <input name="pallada_id" type="text" value="{$pallada_id|escape}" />
- +
- <label>Комментарий к заказу</label>
- <textarea name="comment" id="order_comment">{$comment|escape}</textarea>
- diff --git "a/design/\320\241\320\270\320\274\321\204\320\276\320\275\320\270\321\217/html/email_order.tpl" "b/design/\320\241\320\270\320\274\321\204\320\276\320\275\320\270\321\217/html/email_order.tpl"
- index 055f14d..52d1ff1 100644
- --- "a/design/\320\241\320\270\320\274\321\204\320\276\320\275\320\270\321\217/html/email_order.tpl"
- +++ "b/design/\320+41\320+70\320+74\321+04\320+76\320+75\320+70\321+17/html/email_order.tpl"
- @@ -64,6 +64,16 @@
- </td>
- </tr>
- {/if}
- + {if $order->pallada_id}
- + <tr>
- + <td style="padding:6px; background-color:#f0f0f0; border:1px solid #e0e0e0;font-family:arial;">
- + Pallada ID
- + </td>
- + <td style="padding:6px; background-color:#ffffff; border:1px solid #e0e0e0;font-family:arial;">
- + {$order->pallada_id|escape}
- + </td>
- + </tr>
- + {/if}
- {if $order->address}
- <tr>
- <td style="padding:6px; background-color:#f0f0f0; border:1px solid #e0e0e0;font-family:arial;">
- diff --git "a/design/\320\241\320\270\320\274\321\204\320\276\320\275\320\270\321\217/html/order.tpl" "b/design/\320\241\320\270\320\274\321\204\320\276\320\275\320\270\321\217/html/order.tpl"
- index c2c7a68..cd52c57 100644
- --- "a/design/\320\241\320\270\320\274\321\204\320\276\320\275\320\270\321\217/html/order.tpl"
- +++ "b/design/\320+41\320+70\320+74\321+04\320+76\320+75\320+70\321+17/html/order.tpl"
- @@ -149,6 +149,16 @@
- </td>
- </tr>
- {/if}
- + {if $order->pallada_id}
- + <tr>
- + <td>
- + Pallada ID
- + </td>
- + <td>
- + {$order->pallada_id|escape}
- + </td>
- + </tr>
- + {/if}
- {if $order->address}
- <tr>
- <td>
- diff --git a/simpla/OrderAdmin.php b/simpla/OrderAdmin.php
- index f7130b4..4602fef 100755
- --- a/simpla/OrderAdmin.php
- +++ b/simpla/OrderAdmin.php
- @@ -15,6 +15,7 @@ class OrderAdmin extends Simpla
- $order->name = $this->request->post('name');
- $order->email = $this->request->post('email');
- $order->phone = $this->request->post('phone');
- + $order->pallada_id = $this->request->post('pallada_id');
- $order->address = $this->request->post('address');
- $order->comment = $this->request->post('comment');
- $order->note = $this->request->post('note');
- diff --git a/simpla/design/html/email_order_admin.tpl b/simpla/design/html/email_order_admin.tpl
- index 4e6dc45..bae56c5 100755
- --- a/simpla/design/html/email_order_admin.tpl
- +++ b/simpla/design/html/email_order_admin.tpl
- @@ -67,6 +67,16 @@
- </td>
- </tr>
- {/if}
- + {if $order->pallada_id}
- + <tr>
- + <td style="padding:6px; background-color:#f0f0f0; border:1px solid #e0e0e0;font-family:arial;">
- + Pallada ID
- + </td>
- + <td style="padding:6px; background-color:#ffffff; border:1px solid #e0e0e0;font-family:arial;">
- + {$order->pallada_id|escape}
- + </td>
- + </tr>
- + {/if}
- {if $order->address}
- <tr>
- <td style="padding:6px; background-color:#f0f0f0; border:1px solid #e0e0e0;font-family:arial;">
- diff --git a/simpla/design/html/order.tpl b/simpla/design/html/order.tpl
- index 5e33608..6021976 100755
- --- a/simpla/design/html/order.tpl
- +++ b/simpla/design/html/order.tpl
- @@ -112,6 +112,16 @@
- </div>
- </li>
- <li>
- + <label class=property>Pallada ID</label>
- + <div class="edit_order_detail" style='display:none;'>
- + <input name="pallada_id" class="simpla_inp " type="text" value="{$order->pallada_id|escape}" />
- + </div>
- + <div class="view_order_detail">
- + {if $order->pallada_id}
- + <span class="ip_call" data-pallada_id="{$order->pallada_id|escape}" target="_blank">{$order->pallada_id|escape}</span>{else}{$order->pallada_id|escape}{/if}
- + </div>
- + </li>
- + <li>
- <label class=property>Адрес <a href='http://maps.yandex.ru/' id=address_link target=_blank><img align=absmiddle src='design/images/map.png' alt='Карта в новом окне' title='Карта в новом окне'></a></label>
- <div class="edit_order_detail" style='display:none;'>
- <textarea name="address">{$order->address|escape}</textarea>
- diff --git a/view/CartView.php b/view/CartView.php
- index 18cde37..e5c887d 100755
- --- a/view/CartView.php
- +++ b/view/CartView.php
- @@ -48,6 +48,7 @@ class CartView extends View
- $order->email = $this->request->post('email');
- $order->address = $this->request->post('address');
- $order->phone = $this->request->post('phone');
- + $order->pallada_id = $this->request->post('pallada_id');
- $order->comment = $this->request->post('comment');
- $order->ip = $_SERVER['REMOTE_ADDR'];
- @@ -55,6 +56,7 @@ class CartView extends View
- $this->design->assign('name', $order->name);
- $this->design->assign('email', $order->email);
- $this->design->assign('phone', $order->phone);
- + $this->design->assign('pallada_id', $order->pallada_id);
- $this->design->assign('address', $order->address);
- $captcha_code = $this->request->post('captcha_code', 'string');
- @@ -179,6 +181,7 @@ class CartView extends View
- $this->design->assign('name', $last_order->name);
- $this->design->assign('email', $last_order->email);
- $this->design->assign('phone', $last_order->phone);
- + $this->design->assign('pallada_id', $last_order->pallada_id);
- $this->design->assign('address', $last_order->address);
- }
- else
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement