Changeset a653dec

Timestamp:

Dec 2, 2019, 1:53:56 AM (3 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

5685409

Parents:

fd8c1c5 (diff), 7e45ae2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

lazersib <blacklight@…> (02/12/19 01:53:56)

git-committer:

GitHub <noreply@…> (02/12/19 01:53:56)

Message:

Merge pull request #10 from magnatiwe/add_delivery_and_product_price

Отображение стоимости заказа с доставкой перед оплатой заказа

File:

• web/vitrina.php (modified) (4 diffs)

web/vitrina.php

@@ -1371 +1371 @@
                 $img = '';
             }
+                $product_data = $this->getProductData($item['id']);
+                $product_name_html = html_out($product_data['group_printname'] . ' ' . $product_data['name']);
             $img = isset($item['img_uri']) ? "<img_src='{$item['img_uri']}' alt='" . html_out($item['name']) . "'>" : '';
             $tmpl->addContent("<tr id='korz_ajax_item_{$item['pos_id']}'{$lock_mark}>
@@ -1377 +1379 @@
                     <img src='/img/i_del.png' alt='Убрать'></a></span></td>
                 <td>$img</td>
-                <td><a href='/vitrina.php?mode=product&amp;p={$item['pos_id']}'>" . html_out($item['name']) . "</a></td>
+                <td><a href='/vitrina.php?mode=product&amp;p={$item['pos_id']}'>" . $product_name_html . "</a></td>
                 <td class='right'{$gray_price}>$price_p</td>
                 <td class='right'><span class='sum'>$sum_p</span></td>
@@ -1771 +1773 @@
     /// Заключительная форма оформления покупки
     protected function BuyMakeForm() {
-        global $tmpl;
+        global $tmpl, $db;
         if (@$_SESSION['uid']) {
             $up = getUserProfile($_SESSION['uid']);
@@ -1841 +1843 @@
         }
 
-        $tmpl->addContent("
-        Другая информация:<br>
-        <textarea name='dop' rows='5' cols='80'>" . html_out(@$up['dop']['dop_info']) . "</textarea><br>
-        <button type='submit'>Оформить заказ</button>
-        </div>
-        </form>");
+        $tmpl->addContent("Другая информация:<br><textarea name='dop' rows='5' cols='80'>" . html_out(@$up['dop']['dop_info']) . "</textarea><br>");
+
+            if($this->getBasket()) {
+                $basket = $this->getBasket();
+                    $tmpl->addContent('<br>
+                                <table class="list">
+                                        <tbody>
+                                                <tr class="title">
+                                                        <th width="60%">Наименование</th>
+                                                        <th width="15%">Цена, руб.</th>
+                                                        <th width="10%">Количество</th>
+                                                        <th width="15%">Сумма, руб.</th>
+                                                </tr>
+                        ');
+                    foreach ($basket['items'] as $item) {
+                            $product_data = $this->getProductData($item['id']);
+                            $product_name_html = html_out($product_data['group_printname'] . ' ' . $product_data['name']);
+                            $tmpl->addContent("
+                                <tr>
+                                                <td style='text-align: left'><a href='/vitrina.php?mode=product&amp;p={$item['pos_id']}'>{$product_name_html}</a></td>
+                                                <td>".number_format($item['price'], 2, ',', ' ')."</td>
+                                                <td>{$item['cnt']}</td>
+                                                <td style='text-align: right'>".number_format($item['sum'], 2, ',', ' ')."</td>
+                                        </tr>
+                            ");
+                    }
+
+                    $tmpl->addContent("
+                        <tr>
+                                        <td colspan=\"3\">Сумма заказа:</td>
+                                        <td style='text-align: right' colspan=\"1\">" . number_format($basket['sum'], 2, ',', ' ') . "</td>
+                                </tr>
+                    ");
+
+                    if(!empty($_SESSION['basket']['delivery_region']) && !empty($_SESSION['basket']['delivery_type'])) {
+                            $delivery = $_SESSION['basket']['delivery_type'];
+                            $delivery_region = $_SESSION['basket']['delivery_region'];
+                            $res = $db->query("SELECT `name` FROM `delivery_types` WHERE `id`='$delivery'");
+                            list($d_service_name) = $res->fetch_row();
+                            $res = $db->query("SELECT `price`, `name` FROM `delivery_regions` WHERE `id`='$delivery_region'");
+                            list($d_price, $d_region_name) = $res->fetch_row();
+                            $tmpl->addContent("
+                                <tr>
+                                                <td colspan=\"3\">$d_service_name ($d_region_name):</td>
+                                                <td style='text-align: right' colspan=\"1\">".number_format($d_price, 2, ',', ' ')."</td>
+                                        </tr>
+                         ");
+                    }
+
+                    $tmpl->addContent('
+                                                <tr class="total">
+                                                        <td colspan="3">Итого:</td>
+                                                        <td style=\'text-align: right\' colspan="1">
+                                                        ' . number_format(($basket['sum'] + (isset($d_price) ? $d_price : 0)), 2, ',', ' ') . ' 
+                                                        </td>
+                                                </tr>
+                                        </tbody>
+                                </table><br>
+                        ');
+            }
+
+            $tmpl->addContent("<button type='submit'>Оформить заказ</button></div></form>");
     }