Changeset 2026454

Timestamp:

02/07/2019 10:32:24 AM (7 years ago)

Author:

soft8soft

Message:

New version 2.10.0

Location:

verge3d/trunk

Files:

• app.php (modified) (1 diff)
• order.php (modified) (16 diffs)
• readme.txt (modified) (2 diffs)
• templates/order_admin_form.php (added)
• templates/order_email_body.php (modified) (5 diffs)
• templates/order_failed.php (modified) (1 diff)
• templates/order_form.php (modified) (4 diffs)
• verge3d.php (modified) (2 diffs)

verge3d/trunk/app.php

@@ -185 +185 @@
 
             // process bulk request
-            if (is_array($app))
+            if (is_array($app)) {
                 foreach ($app as $a)
                     if (!empty(intval($a)))
                         v3d_delete_app(intval($a));
-            else
+            } else {
                 if (!empty(intval($app)))
                     v3d_delete_app(intval($app));
+            }
 
             v3d_redirect_app_list();

verge3d/trunk/order.php

@@ -4 +4 @@
     require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php');
 }
-
-// for Captcha
-function start_session() {
-    if (!session_id()) {
-        session_start();
-    }
-}
-add_action('init', 'start_session', 1);
-
 
 function v3d_order_menu()
@@ -24 +15 @@
 
     switch ($action) {
+    case 'createform':
+        $order = array();
+        v3d_display_order($order, -1);
+        break;
     case 'create':
-        $order = array(
-            'title' => '',
-            'content' => '',
-            'price' => '0',
-            'screenshot' => '',
-            'user_name' => '',
-            'user_email' => '',
-            'user_tel' => '',
-            'user_comment' => '',
-        );
-        v3d_display_order($order, -1);
-        break;
-    case 'createorder':
-
-        $order = array(
-            'title' => (!empty($_REQUEST['title'])) ?
-                    sanitize_text_field($_REQUEST['title']) : 'Unknown Order',
-            'content' => (!empty($_REQUEST['content'])) ?
-                    sanitize_textarea_field($_REQUEST['content']) : '',
-            'price' => (!empty($_REQUEST['price'])) ?
-                    sanitize_text_field($_REQUEST['price']) : '0',
-            'screenshot' => (!empty($_REQUEST['screenshot'])) ?
-                    sanitize_text_field($_REQUEST['screenshot']) : '',
-            'user_name' => (!empty($_REQUEST['user_name'])) ?
-                    sanitize_text_field($_REQUEST['user_name']) : '',
-            'user_email' => (!empty($_REQUEST['user_email'])) ?
-                    sanitize_email($_REQUEST['user_email']) : '',
-            'user_tel' => (!empty($_REQUEST['user_tel'])) ?
-                    sanitize_text_field($_REQUEST['user_tel']) : '',
-            'user_comment' => (!empty($_REQUEST['user_comment'])) ?
-                    sanitize_textarea_field($_REQUEST['user_comment']) : '',
-        );
-
-        v3d_create_order($order);
+        v3d_create_order(v3d_request_to_order());
         v3d_redirect_order_list();
         break;
-    case 'edit':
+    case 'editform':
         $order_id = intval($_REQUEST['order']);
 
@@ -69 +31 @@
         }
 
-        $order = array(
-            'title' => get_the_title($order_id),
-            'content' => get_post_field('post_content', $order_id),
-            'price' => get_post_meta($order_id, 'price', true),
-            'screenshot' => get_post_meta($order_id, 'screenshot', true),
-            'user_name' => get_post_meta($order_id, 'user_name', true),
-            'user_email' => get_post_meta($order_id, 'user_email', true),
-            'user_tel' => get_post_meta($order_id, 'user_tel', true),
-            'user_comment' => get_post_meta($order_id, 'user_comment', true),
-        );
-
+        $order = json_decode(get_post_field('post_content', $order_id), true);
         v3d_display_order($order, $order_id);
 
         break;
-    case 'editorder':
+    case 'edit':
         if ($_SERVER['REQUEST_METHOD'] == 'POST' && !empty($_REQUEST['order'])) {
             $order_id = intval($_REQUEST['order']);
 
             if (!empty($_REQUEST['title']) || !empty($_REQUEST['content'])) {
-                $post_arr = array(
-                    'ID'           => $order_id,
-                    'post_title'   => (!empty($_REQUEST['title'])) ?
-                            sanitize_text_field($_REQUEST['title']) : '',
-                    'post_content'   => (!empty($_REQUEST['content'])) ?
-                            sanitize_textarea_field($_REQUEST['content']) : '',
-                    'post_status'  => 'publish',
-                    'post_type'    => 'v3d_order',
-                    'meta_input'   => array(
-                        'price' => (!empty($_REQUEST['price'])) ?
-                                sanitize_text_field($_REQUEST['price']) : '0',
-                        'screenshot' => (!empty($_REQUEST['screenshot'])) ? 
-                                sanitize_text_field($_REQUEST['screenshot']) : '',
-                        'user_name' => (!empty($_REQUEST['user_name'])) ?
-                                sanitize_text_field($_REQUEST['user_name']) : '',
-                        'user_email' => (!empty($_REQUEST['user_email'])) ?
-                                sanitize_email($_REQUEST['user_email']) : '',
-                        'user_tel' => (!empty($_REQUEST['user_tel'])) ?
-                                sanitize_text_field($_REQUEST['user_tel']) : '',
-                        'user_comment' => (!empty($_REQUEST['user_comment'])) ?
-                                sanitize_textarea_field($_REQUEST['user_comment']) : '',
-                    ),
-                );
-                wp_update_post($post_arr);
+                v3d_update_order($order_id, v3d_request_to_order());
             }
 
@@ -127 +56 @@
 
             // process bulk request
-            if (is_array($order))
+            if (is_array($order)) {
                 foreach ($order as $o)
                     if (!empty(intval($o)))
                         v3d_delete_order(intval($o));
-            else
-                if (!empty(intval($order)))
+            } else {
+                if (!empty(intval($order))) {
                     v3d_delete_order($order);
+                }
+            }
 
             v3d_redirect_order_list();
@@ -145 +76 @@
         $orderTable = new V3D_Order_List_Table();
         $orderTable->prepare_items();
-        
+
         ?>
         <div class="wrap">
@@ -151 +82 @@
 
           <h1 class='wp-heading-inline'>E-Commerce Orders</h1>
-          <a href="?page=verge3d_order&action=create" class="page-title-action">Add New</a>
+          <a href="?page=verge3d_order&action=createform" class="page-title-action">Add New</a>
 
           <div class="v3d-hint">
@@ -173 +104 @@
 function v3d_create_order($order) {
     $post_arr = array(
-        'post_title'   => $order['title'],
-        'post_content'   => $order['content'],
+        'post_title'   => '',
+        'post_content' => json_encode($order, JSON_UNESCAPED_UNICODE),
         'post_status'  => 'publish',
-        'post_type'    => 'v3d_order',
-        'meta_input'   => array(
-            'price' => $order['price'],
-            'screenshot' => $order['screenshot'],
-            'user_name' => $order['user_name'],
-            'user_email' => $order['user_email'],
-            'user_tel' => $order['user_tel'],
-            'user_comment' => $order['user_comment'],
-        ),
+        'post_type'    => 'v3d_order'
     );
     wp_insert_post($post_arr);
-
     
     $order_email = get_option('v3d_order_email');
@@ -224 +146 @@
 }
 
+function v3d_update_order($order_id, $order) {
+    $post_arr = array(
+        'ID'           => $order_id,
+        'post_title'   => '',
+        'post_content' => json_encode($order, JSON_UNESCAPED_UNICODE),
+        'post_status'  => 'publish',
+        'post_type'    => 'v3d_order'
+    );
+
+    wp_update_post($post_arr);
+}
+
+function v3d_request_to_order() {
+    $order = array();
+
+    $IGNORED_KEYS = ['page', 'action', 'order'];
+
+    foreach ($_POST as $key => $value) {
+        if (in_array($key, $IGNORED_KEYS, true))
+            continue;
+
+        // allow multi-dimensional keys, separated by ":"
+        $keys = strpos($key, ':') !== false ? explode(':', $key) : array($key);
+
+        $ptr = &$order;
+
+        foreach ($keys as $k) {
+            if (!isset($ptr[$k])) {
+                $ptr[$k] = array();
+            }
+            $ptr = &$ptr[$k];
+        }
+        if (empty($ptr)) {
+            $ptr = $value;
+        } else {
+            $ptr[] = $value;
+        }
+    }
+
+    return $order;
+}
+
 function v3d_display_order($order, $order_id) {
-    $title = $order['title'];
-    $content = $order['content'];
-    $price = $order['price'];
-    $screenshot = $order['screenshot'];
-    $user_name = $order['user_name'];
-    $user_email = $order['user_email'];
-    $user_tel = $order['user_tel'];
-    $user_comment = $order['user_comment'];
-
-    ?>
-    <div class="wrap">
-      <h1 class="wp-heading-inline"><?php echo $order_id > -1 ? 'Update Order' : 'Create Order' ?></h1>
-      <form method="post" id="updateorderform">
-        <input type="hidden" name="page" value="<?php echo sanitize_text_field($_REQUEST['page']) ?>" />
-        <input type="hidden" name="action" value="<?php echo $order_id > -1 ? 'editorder' : 'createorder' ?>" />
-        <input type="hidden" name="order" value="<?php echo $order_id ?>" />
-        <table class="form-table">
-          <tbody>
-            <tr class="form-field form-required">
-              <th scope="row">
-                <label for="title">Title <span class="description">(required)</span></label>
-              </th>
-              <td>
-                <input type="text" name="title" id="title" value="<?php echo $title ?>" required="true" autocapitalize="none" autocorrect="off" maxlength="200">
-              </td>
-            </tr>
-            <tr class="form-field form-required">
-              <th scope="row">
-                <label for="content">Content <span class="description">(required)</span></label>
-              </th>
-              <td>
-                <input type="text" name="content" id="content" value="<?php echo $content ?>" required="true" autocapitalize="none" autocorrect="off" maxlength="200">
-              </td>
-            </tr>
-            <tr class="form-field form-required">
-              <th scope="row">
-                <label for="price">Total Price <span class="description">(required)</span></label>
-              </th>
-              <td>
-                <input type="text" name="price" id="price" value="<?php echo $price ?>" required="true" >
-              </td>
-            </tr>
-            <tr class="form-field form-required">
-              <th scope="row">
-                <label for="user_name">Customer Name <span class="description">(required)</span></label>
-              </th>
-              <td>
-                <input type="text" name="user_name" id="user_name" value="<?php echo $user_name ?>" required="true" >
-              </td>
-            </tr>
-            <tr class="form-field form-required">
-              <th scope="row">
-                <label for="user_email">Customer E-Mail <span class="description">(required)</span></label>
-              </th>
-              <td>
-                <input type="email" name="user_email" id="user_email" value="<?php echo $user_email ?>" required="true" >
-              </td>
-            </tr>
-            <tr class="form-field form-required">
-              <th scope="row">
-                <label for="user_tel">Customer Phone <span class="description">(required)</span></label>
-              </th>
-              <td>
-                <input type="tel" name="user_tel" id="user_tel" value="<?php echo $user_tel ?>" required="true" >
-              </td>
-            </tr>
-            <tr class="form-field">
-              <th scope="row">
-                <label for="user_comment">Comments</label>
-              </th>
-              <td>
-                <input type="tel" name="user_comment" id="user_comment" value="<?php echo $user_comment ?>">
-              </td>
-            </tr>
-            <tr class="form-field">
-              <th scope="row">
-                <label for="screenshot">Screenshot</label>
-              </th>
-              <td>
-                <img src="<?php echo $screenshot ?>" id="screenshot" class="v3d-admin-screenshot">
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <p class="submit"><input type="submit" class="button button-primary"></p>
-      </form>
-    </div>
-    <?php
+    include v3d_get_template('order_admin_form.php');
 }
 
@@ -345 +222 @@
     function column_default($item, $column_name){
         switch ($column_name) {
-        case 'content':
         case 'price':
         case 'user_name':
         case 'user_email':
-        case 'user_tel':
+        case 'user_phone':
         case 'date':
             return $item[$column_name];
         default:
-            return print_r($item, true); //Show the whole array for troubleshooting purposes
+            return print_r($item, true); // show the whole array for troubleshooting purposes
         }
     }
@@ -362 +238 @@
         $actions = array(
             'edit'      => sprintf('<a href="?page=%s&action=%s&order=%s">Edit</a>',
-                    sanitize_text_field($_REQUEST['page']), 'edit', $item['ID']),
+                    sanitize_text_field($_REQUEST['page']), 'editform', $item['ID']),
             'delete'    => sprintf('<a href="?page=%s&action=%s&order=%s">Delete</a>',
                     sanitize_text_field($_REQUEST['page']), 'delete', $item['ID']),
@@ -386 +262 @@
             'cb'      => '<input type="checkbox" />', //Render a checkbox instead of text
             'title'   => 'Title',
-            'content' => 'Content',
             'price'   => 'Total Price',
             'user_name'   => 'Customer',
             'user_email'   => 'Customer Email',
-            'user_tel'   => 'Phone Number',
+            'user_phone'   => 'Phone Number',
             'date'    => 'Date',
         );
@@ -402 +277 @@
             'user_name'  => array('user_name', false),
             'user_email' => array('user_email', false),
-            'user_tel'   => array('user_tel', false),
+            'user_phone' => array('user_phone', false),
             'date'       => array('date', false),
         );
@@ -464 +339 @@
 
         foreach ($q_posts as $q_post) {
-            $email = get_post_meta($q_post->ID, 'user_email', true);
+
+            $content = json_decode($q_post->post_content, true);
 
             $posts[] = array(
                 'ID'     => $q_post->ID,
-                'title'  => $q_post->post_title,
-                'content'  => $q_post->post_content,
-                'price' => get_post_meta($q_post->ID, 'price', true),
-                'user_name' => get_post_meta($q_post->ID, 'user_name', true),
-                'user_email' => '<a href="mailto:'.$email.'">'.$email.'</a>',
-                'user_tel' => get_post_meta($q_post->ID, 'user_tel', true),
+                'title'  => (!empty($content['title'])) ? $content['title'] : 'N/A',
+                'price'  => (!empty($content['price'])) ? $content['price'] : 'N/A',
+                'user_name'  => (!empty($content['user_name'])) ? $content['user_name'] : 'N/A',
+                'user_email'  => (!empty($content['user_email'])) ? $content['user_email'] : 'N/A',
+                'user_phone'  => (!empty($content['user_phone'])) ? $content['user_phone'] : 'N/A',
                 'date'   => $q_post->post_date,
             );
@@ -508 +383 @@
     $screenshot = '';
     if (!empty($_REQUEST['v3d_screenshot'])) {
-        $screenshot = sanitize_text_field($_REQUEST['v3d_screenshot']);
-
         if ($action != 'submit') {
-            $screenshot = str_replace('data:image/png;base64,', '', $screenshot);
-            $screenshot = str_replace(' ', '+', $screenshot);
-
-            $upload_dir = v3d_get_upload_dir();
-            $screenshot_dir = $upload_dir.'screenshots/'; 
-            if (!is_dir($screenshot_dir)) {
-                mkdir($screenshot_dir, 0777, true);
-            }
-
-            $data = base64_decode($screenshot);
-            $file = $screenshot_dir.time().'.png';
-            $success = file_put_contents($file, $data);
-            if ($success)
-                $screenshot = v3d_get_upload_url().'screenshots/'.basename($file);
+            $screenshot = v3d_save_screenshot(sanitize_text_field($_REQUEST['v3d_screenshot']));
+        } else {
+            $screenshot = sanitize_text_field($_REQUEST['v3d_screenshot']);
         }
     }
@@ -530 +392 @@
     $user_name = (!empty($_REQUEST['v3d_user_name'])) ? sanitize_text_field($_REQUEST['v3d_user_name']) : '';
     $user_email = (!empty($_REQUEST['v3d_user_email'])) ? sanitize_email($_REQUEST['v3d_user_email']) : '';
-    $user_tel = (!empty($_REQUEST['v3d_user_tel'])) ? sanitize_text_field($_REQUEST['v3d_user_tel']) : '';
+    $user_phone = (!empty($_REQUEST['v3d_user_phone'])) ? sanitize_text_field($_REQUEST['v3d_user_phone']) : '';
     $user_comment = (!empty($_REQUEST['v3d_user_comment'])) ? sanitize_textarea_field($_REQUEST['v3d_user_comment']) : '';
 
     if ($action == 'submit') {
-        if ($_SESSION['captcha_string'] == sanitize_text_field($_REQUEST["v3d_captcha"])) {
-            v3d_create_order(array(
-                'title' => $title,
-                'content' => $content,
-                'price' => $price,
-                'screenshot' => $screenshot,
-                'user_name' => $user_name,
-                'user_email' => $user_email,
-                'user_tel' => $user_tel,
-                'user_comment' => $user_comment,
-            ));
-            ob_start();
-            include v3d_get_template('order_success.php');
-            return ob_get_clean();
-        } else {
-            ob_start();
-            include v3d_get_template('order_failed.php');
-            return ob_get_clean();
-        }
+        v3d_create_order(array(
+            'title' => $title,
+            'content' => $content,
+            'price' => $price,
+            'screenshot' => $screenshot,
+            'user_name' => $user_name,
+            'user_email' => $user_email,
+            'user_phone' => $user_phone,
+            'user_comment' => $user_comment,
+        ));
+        ob_start();
+        include v3d_get_template('order_success.php');
+        return ob_get_clean();
     } else {
-        $_SESSION['count'] = time();
-        v3d_create_captcha();
-        $captcha_url = v3d_get_upload_url().'captcha/'.$_SESSION['count'].'.png';
-
         ob_start();
         include v3d_get_template('order_form.php');
         return ob_get_clean();
     }
+}
+
+function v3d_save_screenshot($data_url) {
+
+    $data_url = str_replace('data:image/png;base64,', '', $data_url);
+    $data_url = str_replace(' ', '+', $data_url);
+
+    $upload_dir = v3d_get_upload_dir();
+    $screenshot_dir = $upload_dir.'screenshots/'; 
+    if (!is_dir($screenshot_dir)) {
+        mkdir($screenshot_dir, 0777, true);
+    }
+
+    $data = base64_decode($data_url);
+    $file = $screenshot_dir.time().'.png';
+    $success = file_put_contents($file, $data);
+    if ($success)
+        return v3d_get_upload_url().'screenshots/'.basename($file);
+    else
+        return '';
 }
  
@@ -578 +450 @@
 }
 
-function v3d_create_captcha()
-{
-    global $image;
-    $image = imagecreatetruecolor(150, 40) or die("Cannot Initialize new GD image stream");
-    $background_color = imagecolorallocate($image, 255, 255, 255);
-    $text_color = imagecolorallocate($image, 0, 255, 255);
-    $line_color = imagecolorallocate($image, 64, 64, 64);
-    $pixel_color = imagecolorallocate($image, 128, 128, 255);
-    imagefilledrectangle($image, 0, 0, 150, 40, $background_color);
-    //for ($i = 0; $i < 3; $i++) {
-    //    imageline($image, 0, rand() % 40, 150, rand() % 40, $line_color);
-    //}
-    for ($i = 0; $i < 500; $i++) {
-        imagesetpixel($image, rand() % 150, rand() % 40, $pixel_color);
-    }
-    $letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-    $len = strlen($letters);
-    $letter = $letters[rand(0, $len - 1)];
-    $text_color = imagecolorallocate($image, 0, 0, 0);
-    $word = "";
-    for ($i = 0; $i < 6; $i++) {
-        $letter = $letters[rand(0, $len - 1)];
-        imagestring($image, 5, 20 + ($i * 20), 12, $letter, $text_color);
-        $word .= $letter;
-    }
-    $_SESSION['captcha_string'] = $word;
-
-    $upload_dir = v3d_get_upload_dir();
-    $captcha_dir = $upload_dir.'captcha/';
-
-    if (!is_dir($captcha_dir)) {
-        mkdir($captcha_dir, 0777, true);
-    }
-
-    $images = glob($captcha_dir.'*.png');
-
-    foreach ($images as $image_to_delete) {
-        @unlink($image_to_delete);
-    }
-    imagepng($image, $captcha_dir . $_SESSION['count'] . ".png");
-}
-
+
+function v3d_api_place_order(WP_REST_Request $request) {
+  
+    $params = $request->get_json_params();
+
+    if (!empty($params)) {
+
+        if (!empty($params['screenshot']))
+            $params['screenshot'] = v3d_save_screenshot($params['screenshot']);
+
+        v3d_create_order($params);
+
+        $response = new WP_REST_Response(
+            array(
+                'order' => 'ok',
+            )
+        );
+    } else {
+
+        $response = new WP_Error('wrong_order_params', 'Wrong order params', array('status' => 400));
+
+    }
+
+    $response->header('Access-Control-Allow-Origin', '*');
+    return $response;
+
+}
+
+add_action('rest_api_init', function () {
+    register_rest_route('verge3d/v1', '/place_order', array(
+        'methods' => 'POST',
+        'callback' => 'v3d_api_place_order',
+    ));
+});

verge3d/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 4.9.5
 Requires PHP: 5.6
-Stable tag: 2.8.0
+Stable tag: 2.10.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -33 +33 @@
 == Changelog ==
 
+= 2.10 =
+* Support for JSON API and customized order templates.
+
 = 2.8 =
 * Fixed issue in applications with multiple HTML files

verge3d/trunk/templates/order_email_body.php

@@ -35 +35 @@
           </th>
           <td>
-            <?php echo $order['content'] ?>
+            <?php echo esc_html($order['content']) ?>
           </td>
         </tr>
@@ -43 +43 @@
           </th>
           <td>
-            <?php echo $order['price'] ?>
+            <?php echo esc_html($order['price']) ?>
           </td>
         </tr>
@@ -51 +51 @@
           </th>
           <td>
-            <?php echo $order['user_email'] ?>
+            <?php echo esc_html($order['user_email']) ?>
           </td>
         </tr>
@@ -59 +59 @@
           </th>
           <td>
-            <?php echo $order['user_tel'] ?>
+            <?php echo esc_html($order['user_phone']) ?>
           </td>
         </tr>
@@ -67 +67 @@
           </th>
           <td>
-            <?php echo $order['user_comment'] ?>
+            <?php echo esc_html($order['user_comment']) ?>
           </td>
         </tr>

verge3d/trunk/templates/order_failed.php

@@ -1 +1 @@
 <div class="v3d-order-form">
-  Wrong order parameters or incorrect captcha. Please come back and try again.
+  Wrong order parameters. Please come back and try again.
 </div>

verge3d/trunk/templates/order_form.php

@@ -44 +44 @@
           </th>
           <td>
-            <textarea name="textarea" readonly><?php echo $content ?></textarea>
+            <textarea name="textarea" readonly><?php echo esc_html($content) ?></textarea>
           </td>
         </tr>
@@ -52 +52 @@
           </th>
           <td>
-            <input type="text" name="v3d_price" id="v3d_price" value="<?php echo $price ?>" required="true" readonly>
+            <input type="text" name="v3d_price" id="v3d_price" value="<?php echo esc_html($price) ?>" required="true" readonly>
           </td>
         </tr>
@@ -73 +73 @@
         <tr class="form-field form-required">
           <th scope="row">
-            <label for="v3d_user_tel">Your Phone <span class="v3d-asterix">*</span></label>
+            <label for="v3d_user_phone">Your Phone <span class="v3d-asterix">*</span></label>
           </th>
           <td>
-            <input type="tel" name="v3d_user_tel" id="v3d_user_tel" value="" required="true" >
+            <input type="tel" name="v3d_user_phone" id="v3d_user_phone" value="" required="true" >
           </td>
         </tr>
@@ -95 +95 @@
           </td>
         </tr>
-        <tr class="form-field form-required">
-          <th scope="row">
-            <img src="<?php echo $captcha_url ?>" style="min-width:150px; vertical-align:top;">
-          </th>
-          <td>
-            <input type="text" name="v3d_captcha" id="v3d_captcha" value="" required="true" >
-          </td>
-        </tr>
       </tbody>
     </table>

verge3d/trunk/verge3d.php

@@ -4 +4 @@
 Plugin URI: https://www.soft8soft.com/verge3d
 Description: Verge3D is the most artist-friendly toolkit for creating interactive web-based experiences. It can be used to create product configurators, 3D presentations, online stores, e-learning apps, 3D portfolios, browser games and more.
-Version: 2.8.0
+Version: 2.10.0
 Author: Soft8Soft LLC
 Author URI: https://www.soft8soft.com
@@ -267 +267 @@
 
 function v3d_get_template($name) {
-    return plugin_dir_path(__FILE__).'templates/'.$name;
-}
-
+
+    $v3d_theme_dir = get_stylesheet_directory().'/verge3d/';
+
+    if (is_file($v3d_theme_dir.$name))
+        return $v3d_theme_dir.$name;
+    else
+        return plugin_dir_path(__FILE__).'templates/'.$name;
+}
+