WordPress.org
Get WordPress

Plugin Directory

Changeset 3335016


Ignore:
Timestamp:
07/27/2025 10:46:53 PM (8 months ago)
Author:
sjcope
Message:

version 2.4

Location:
consignment-store-for-woocommerce
Files:
58 added
19 edited

Legend:

Unmodified
Added
Removed

  • consignment-store-for-woocommerce/trunk/README.txt

    r3325813 r3335016  
    44Tags: consignment store, consignment for WooCommerce
    55Tested up to: 6.8
    6 Stable tag: 2.3
     6Stable tag: 2.4
    77License: GPLv2
    88License URI: https://www.gnu.org/licenses/gpl-2.0.html
    … …  
    7575
    7676== Changelog ==
     77= 2.4 =
     78* Make database queries use prepare.
     79
    7780= 2.3 =
    7881* Add another split.
    … …  
    151154
    152155== Upgrade Notice ==
     156= 2.4 =
     157* Make database queries use prepare. Update when convenient.
     158
    153159= 2.3 =
    154160* Add another split. Update when convenient.

  • consignment-store-for-woocommerce/trunk/admin/_notes/dwsync.xml

    r3312681 r3335016  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<dwsync>
    3 <file name="class-cws-consignment-admin.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133944024526068820" remote="133944132000000000" />
    4 <file name="index.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133939708800000000" remote="133940665800000000" />
     3<file name="class-cws-consignment-admin.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133981297645931940" remote="133981405200000000" />
     4<file name="index.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133966464000000000" remote="133981231200000000" />
    55</dwsync>

  • consignment-store-for-woocommerce/trunk/admin/class-cws-consignment-admin.php

    r3324462 r3335016  
    394394        $search_kw = sanitize_text_field($search_kw);
    395395        $search_kw = str_replace(' ', '%', $search_kw);
    396         $search_kw = '%'.$search_kw.'%';
     396        $search_kw = '%'.$wpdb->esc_like($search_kw).'%';
    397397    }
    398398    $results = $wpdb->get_results( $wpdb->prepare ( 'SELECT * FROM '.$wpdb->prefix.'cwscs_inventory WHERE item_title LIKE %s OR item_desc LIKE %s OR item_size LIKE %s OR item_colour LIKE %s OR item_state LIKE %s ORDER BY date_added', array($search_kw, $search_kw, $search_kw, $search_kw, $search_kw) )); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
    … …  
    411411    $results = array();
    412412    // figure out the where statement
    413     $where = "WHERE approved=1";
    414     $conn = " AND ";
     413
    415414    if ($show == "unpaid") {
    416         $where .= $conn.'paid=0';
    417         $conn = ' AND ';
     415        $paid=0;
    418416    } elseif ($show == "paid") {
    419         $where .= $conn.'paid>0';
    420         $conn = ' AND ';
     417        $paid = 1;
    421418    }
    422419    if (isset($search_sku) && $search_sku > 0) {
    423         $search_sku = sanitize_text_field($search_sku);
    424         $where .= $conn.' sku='.$search_sku;
    425         $conn = ' AND ';
     420        if (isset($paid)) {
     421            $items = $wpdb->get_results($wpdb->prepare('SELECT * FROM '.$wpdb->prefix.'cwscs_inventory WHERE approved=1 AND paid=%d AND sku=%s ORDER BY sku', array($paid, $search_sku))); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
     422        } else {
     423            $items = $wpdb->get_results($wpdb->prepare('SELECT * FROM '.$wpdb->prefix.'cwscs_inventory WHERE approved=1 AND sku=%s ORDER BY sku', array($search_sku))); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
     424        }
     425       
    426426    } elseif (isset($search_kw) && $search_kw != "") {
    427427        $search_kw = sanitize_text_field($search_kw);
    428         $search_kw = str_replace(' ', '%', $search_kw);
    429         $search_kw = '%'.$search_kw.'%';
    430         $where .= $conn.' (item_title LIKE "'.$search_kw.'" OR item_desc LIKE "'.$search_kw.'" OR item_size LIKE "'.$search_kw.'" OR item_colour LIKE "'.$search_kw.'" OR item_state LIKE "'.$search_kw.'")';
    431     }
    432 
    433     $items = $wpdb->get_results('SELECT * FROM '.$wpdb->prefix.'cwscs_inventory '.$where.' ORDER BY sku'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
     428        $search_kw = '%'.$wpdb->esc_like($search_kw).'%';
     429        if (isset($paid)) {
     430            $items = $wpdb->get_results($wpdb->prepare('SELECT * FROM '.$wpdb->prefix.'cwscs_inventory WHERE approved=1 AND paid=%d AND (item_title LIKE %s OR item_desc LIKE %s OR item_size LIKE %s OR item_colour LIKE %s OR item_state LIKE %s) ORDER BY sku', array($paid, $search_kw, $search_kw, $search_kw, $search_kw, $search_kw))); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
     431        } else {
     432            $items = $wpdb->get_results($wpdb->prepare('SELECT * FROM '.$wpdb->prefix.'cwscs_inventory WHERE approved=1 AND (item_title LIKE %s OR item_desc LIKE %s OR item_size LIKE %s OR item_colour LIKE %s OR item_state LIKE %s) ORDER BY sku', array($search_kw, $search_kw, $search_kw, $search_kw, $search_kw))); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
     433        }
     434    } elseif ($show == "unpaid" || $show == "paid") {
     435        $items = $wpdb->get_results($wpdb->prepare('SELECT * FROM '.$wpdb->prefix.'cwscs_inventory WHERE approved=1 AND paid=%d ORDER BY sku', array($paid))); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
     436    } else {
     437        $items = $wpdb->get_results('SELECT * FROM '.$wpdb->prefix.'cwscs_inventory WHERE approved=1 ORDER BY sku'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
     438    }
     439   
    434440    if (!is_object($items) && !is_array($items)) {
    435441        $tmp = 'Failed to find inventory. Error is '.$wpdb->last_error.'. Search criteria are '.$show.' store tag: '.$search_sku.', keywords: '.$search_kw.'. WHERE is '.$where;
    … …  
    517523        echo '<p class="cwscs_successmsg">Item approved and saved to store successfully. </p>';
    518524        // send email to Seller if checked
    519         if (isset($_POST['approved_sendemail']) && $_POST['approved_sendemail'] == "Yes" && isset($_POST['approved-email']) && $_POST['approved-email'] != "" && isset($_POST['approved-body']) && $_POST['approved-body'] != "") {
     525        if (isset($_POST['approved_sendemail']) && $_POST['approved_sendemail'] == "Yes" && isset($_POST['approved-email']) && $_POST['approved-email'] != "" && isset($_POST['approved_body']) && $_POST['approved_body'] != "") {
    520526            $emails = cwscsGetMyEmails();
    521527            if (isset($_POST['approved-email']) && isset($emails) && isset($emails[0]) && $emails[0] != "") {
    522528                $to = sanitize_email(wp_unslash($_POST['approved-email']));
    523529                $from = $emails[0];
    524                 if (isset($_POST['approved-body'])) {
    525                     $body = wp_kses( $_POST['approved-body'], cwscs_allowed_html() );
     530
     531                if (isset($_POST['approved_subject'])) {
     532                    $subject = wp_unslash( $_POST['approved_subject'] );
     533                } else {
     534                    $subject = "Your item has been approved";
     535                }
     536               
     537                if (isset($_POST['approved_body'])) {
     538                    $body = wp_unslash( nl2br( $_POST['approved_body'] ) );
    526539                } else {
    527540                    $body = "";
    528541                }
    529                
    530                 $headers="From: ".$from."\r\n";
    531                 $subject = get_option('siteurl').' has accepted your item!';
     542                $headers = array("Content-Type: text/html; charset=UTF-8\r\n");
     543                $headers[] = "From: ".$from."\r\n";
    532544                $test = @wp_mail($to, $subject, $body, $headers);
    533545                if ($test)
    534                     echo '<p class="cwscs_successmsg">An email sent. </p>';
     546                    echo '<p class="cwscs_successmsg">An email was sent successfully. </p>';
    535547                else
    536548                    echo '<p class="cwscs_failmsg">Could not send email. </p>';
    … …  
    579591
    580592    // send email to Seller if selected
    581     if (isset($_POST['rejected_sendemail']) && $_POST['rejected_sendemail'] == "Yes" && isset($_POST['rejected-email']) && $_POST['rejected-email'] != "" && isset($_POST['rejected-body']) && $_POST['rejected-body'] != "") {
     593    if (isset($_POST['rejected_sendemail']) && $_POST['rejected_sendemail'] == "Yes" && isset($_POST['rejected-email']) && $_POST['rejected-email'] != "" && isset($_POST['rejected_body']) && $_POST['rejected_body'] != "") {
    582594        $emails = cwscsGetMyEmails();
    583595        if (isset($emails) && isset($emails[0]) && $emails[0] != "") {
    584596            $to = sanitize_email(wp_unslash($_POST['rejected-email']));
    585597            $from = $emails[0];
    586             $body = wp_kses( $_POST['rejected-body'], cwscs_allowed_html() );
    587             $headers="From: ".$from."\r\n";
    588             $subject = 'Update from '.get_option('siteurl');
     598            if (isset($_POST['rejected_subject'])) {
     599                $subject = wp_unslash( $_POST['rejected_subject'] );
     600            } else {
     601                $subject = "Your item has been rejected";
     602            }
     603            $body = wp_unslash( nl2br( $_POST['rejected_body'] ) );
     604            $headers = array("Content-Type: text/html; charset=UTF-8\r\n");
     605            $headers[] = "From: ".$from."\r\n";
    589606            $test = @wp_mail($to, $subject, $body, $headers);
    590607            if ($test)

  • consignment-store-for-woocommerce/trunk/admin/css/_notes/dwsync.xml

    r3312681 r3335016  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<dwsync>
    3 <file name="cws-consignment-admin.css" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133940556029302595" remote="133940665800000000" />
     3<file name="cws-consignment-admin.css" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133981156606830033" remote="133981266000000000" />
    44</dwsync>

  • consignment-store-for-woocommerce/trunk/admin/css/cws-consignment-admin.css

    r3312681 r3335016  
    1111    padding:5px;
    1212}
    13 form.cwsreview_item textarea, form.cwsreview_item input[type="email"], .cwscs_tabcontent textarea {
     13form.cwsreview_item select, form.cwsreview_item textarea, form.cwsreview_item input[type="text"], form.cwsreview_item input[type="email"], .cwscs_tabcontent textarea {
    1414    width: 80%;
    1515    display: block;
    1616    padding: 8px;
    1717}
    18 form.cwsreview_item textarea, .cwscs_tabcontent textarea {
     18form.cwsreview_item textarea {
     19    min-height:300px;
     20}
     21#wp-email_body-wrap {
     22    max-width: 80%;
     23}
     24.cwscs_tabcontent textarea {
    1925    height:150px;
    2026}

  • consignment-store-for-woocommerce/trunk/admin/js/_notes/dwsync.xml

    r3312681 r3335016  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<dwsync>
    3 <file name="cws-consignment-admin.js" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133940555719076738" remote="133940665800000000" />
     3<file name="cws-consignment-admin.js" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133966464000000000" remote="133981231200000000" />
    44</dwsync>

  • consignment-store-for-woocommerce/trunk/admin/partials/_notes/dwsync.xml

    r3312681 r3335016  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<dwsync>
    3 <file name="cws-consignment-admin-display.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133944005919036323" remote="133944113400000000" />
    4 <file name="cwscs-consignment.jpg" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133939708800000000" remote="133940665800000000" />
     3<file name="cws-consignment-admin-display.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133981293365623438" remote="133981404000000000" />
     4<file name="cwscs-consignment.jpg" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133966464000000000" remote="133981231200000000" />
    55</dwsync>

  • consignment-store-for-woocommerce/trunk/admin/partials/cws-consignment-admin-display.php

    r3324462 r3335016  
    6464        echo '
    6565        <p id="p-store_split" class="cwshidden hideifrejected">
    66             <label for "store_split">Review Store Split</label>
     66            <label for "store_split">Review Store Split:</label>
    6767            <select id="store_split" name="store_split">';
    6868            foreach ($splits as $i => $s) {
    … …  
    7676        </p>
    7777        <p id="p-sku" class="cwshidden hideifrejected">
    78             <label for "sku">Enter SKU</label>
     78            <label for "sku">Enter SKU:</label>
    7979            <input type="text" id="sku" name="sku" maxlength=8 value="';
    8080            if ($row->sku != "")
    … …  
    114114            </p>
    115115            <div id="approved-email-content">
    116                 <label>Email To</label>
     116                <label>Email To:</label>
    117117                <input type="email" name="approved-email" value="'.esc_html($row->email).'" />
    118                 <label>Body of Email</label>
    119                 <textarea name="approved-body">We have approved your item: '.esc_html($row->item_title)."\r\n\r\nThe sale price will be $".number_format($sale, 2)."\r\n\r\nWe will split any proceeds 50 / 50. \r\n\r\nIf the item does not sell within 6 months we will donate it. \r\n\r\nYou may drop it off during store hours. \r\n\r\nBe sure to see this item and other items in the store on our website.\r\n\r\nThanks, Store Manager</textarea>
    120             </div>".'
     118                <label>Subject:</label>
     119                <input type="text" name="approved_subject" required maxlength="255" autocomplete="off" value="Your item has been approved" />
     120                <label>Email Body:</label>';
     121                $initial_data = 'We have approved your item: '.esc_html($row->item_title)."<br /><br />The sale price will be $".number_format($sale, 2)."\r\n\r\nWe will split any proceeds 50 / 50. \r\n\r\nIf the item does not sell within 6 months we will donate it. \r\n\r\nYou may drop it off during store hours. \r\n\r\nBe sure to see this item and other items in the store on our website.\r\n\r\nThanks, Store Manager";
     122                $mce_settings = array(
     123                    'quicktags'      => array(
     124                        'buttons' => 'em,strong,link',
     125                    ),
     126                    'text_area_name' => 'approved_body',
     127                    'textarea_rows'  => 15,
     128                    'editor_height'  => 300,
     129                    'quicktags'      => true,
     130                    'tinymce'        => true,
     131                );
     132                $id = 'approved_body';
     133                //has to be lower case
     134                wp_editor( $initial_data, $id, $mce_settings );
     135                echo '
     136            </div>
    121137        </div>';
    122138        if ($row->approved == 2)
    … …  
    137153            </p>
    138154            <div id="rejected-email-content">
    139                 <label>Email To</label>
     155                <label>Email To:</label>
    140156                <input type="email" name="rejected-email" value="'.esc_html($row->email).'" />
    141                 <label>Body of Email</label>
    142                 <textarea name="rejected-body">I am sorry but I cannot accept your item, '.esc_html($row->item_title).", for sale at the Consignment Store. \r\n\r\nThanks, Store Manager</textarea>".'
     157                <label>Subject:</label>
     158                <input type="text" name="rejected_subject" value="Your item has been rejected" />
     159                <label>Body of Email:</label>';
     160                $initial_data = 'I am sorry but I cannot accept your item, '.esc_html($row->item_title).", for sale at the Consignment Store. \r\n\r\nThanks, Store Manager";
     161                $mce_settings = array(
     162                    'quicktags'      => array(
     163                        'buttons' => 'em,strong,link',
     164                    ),
     165                    'text_area_name' => 'rejected_body',
     166                    'textarea_rows'  => 15,
     167                    'editor_height'  => 300,
     168                    'quicktags'      => true,
     169                    'tinymce'        => true,
     170                );
     171                $id = 'rejected_body';
     172                //has to be lower case
     173                wp_editor( $initial_data, $id, $mce_settings );
     174                echo '
    143175            </div>
    144176        </div> 
    … …  
    239271        echo '/> '.esc_html(ucfirst($t)).'</label>&nbsp;&nbsp;';
    240272    } // END loop on types
    241     echo '<br />
     273    echo '<br /><br />
    242274        <label for="store_tag"><strong>Search on SKU:</strong> </label>
    243275        <input type="text" name="search_sku" id="search_sku" style="width:150px" value="'.esc_html($search_sku).'" \>&nbsp;&nbsp;

  • consignment-store-for-woocommerce/trunk/cws-consignment.php

    r3325813 r3335016  
    1919 * Requires at least: 6.3
    2020 * Requires PHP:      8.0
    21  * Version:           2.3
     21 * Version:           2.4
    2222 * Author:            Charlene's Web Services
    2323 * Author URI:        https://charlenesweb.ca
    … …  
    3636 * First release 1.0.0 and then using SemVer - https://semver.org X.Y.Z (Major.Minor.Patch)
    3737 */
    38 define( 'CWS_CONSIGNMENT_VERSION', '2.3' );
     38define( 'CWS_CONSIGNMENT_VERSION', '2.4' );
    3939define('CWSCS_SRC_DIR', dirname(__FILE__) );
    4040/**

  • consignment-store-for-woocommerce/trunk/includes/_notes/dwsync.xml

    r3312681 r3335016  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<dwsync>
    3 <file name="class-cws-consignment-activator.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133940473151975784" remote="133940666400000000" />
    4 <file name="class-cws-consignment-deactivator.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133939708800000000" remote="133940666400000000" />
    5 <file name="class-cws-consignment-loader.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133939708800000000" remote="133940666400000000" />
    6 <file name="class-cws-consignment.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133940548965191087" remote="133940666400000000" />
    7 <file name="index.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133939708800000000" remote="133940666400000000" />
     3<file name="class-cws-consignment-activator.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133981005505241201" remote="133981231200000000" />
     4<file name="class-cws-consignment-deactivator.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133966464000000000" remote="133981231200000000" />
     5<file name="class-cws-consignment-loader.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133966464000000000" remote="133981231200000000" />
     6<file name="class-cws-consignment.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133980992798925205" remote="133981231200000000" />
     7<file name="index.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133966464000000000" remote="133981231200000000" />
    88</dwsync>

  • consignment-store-for-woocommerce/trunk/includes/class-cws-consignment-activator.php

    r3312681 r3335016  
    3333        // Set up inventory table in website
    3434        global $wpdb;
     35        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
     36        $charset_collate = $wpdb->get_charset_collate();
     37       
    3538        // inventory table
    36         $charset_collate = $wpdb->get_charset_collate();
    37         $query = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($wpdb->prefix . "cwscs_inventory"));
    38         if ($wpdb->get_var($query) != $wpdb->prefix . "cwscs_inventory") {
    39             $sql = "CREATE TABLE ".$wpdb->prefix."cwscs_inventory (
    40                 `ID` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
    41                 `item_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0',
    42                 `item_cat` int(3) DEFAULT '0',
    43                 `item_desc` text,
    44                 `item_tags` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
    45                 `item_retail` int(4) NOT NULL DEFAULT '0' COMMENT 'retail price',
    46                 `item_sale` int(4) NOT NULL DEFAULT '0' COMMENT 'price in store',
    47                 `item_size` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
    48                 `item_colour` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
    49                 `item_state` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
    50                 `item_image1` int(7) DEFAULT '0',
    51                 `item_image2` int(7) DEFAULT '0',
    52                 `item_image3` int(7) DEFAULT '0',
    53                 `item_image4` int(7) DEFAULT '0',
    54                 `seller_name` varchar(150) DEFAULT NULL,
    55                 `phone` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
    56                 `email` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
    57                 `policy_accepted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1=accepted',
    58                 `dropoff` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
    59                 `sku` varchar(255) NOT NULL DEFAULT '0',
    60                 `store_split` tinyint(2) NOT NULL DEFAULT '50' COMMENT 'Split to store',
    61                 `reviewer_comments` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
    62                 `approved` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1 if approved',
    63                 `date_added` date NOT NULL,
    64                 `date_sold` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
    65                 `sold_price` decimal(8,2) NOT NULL DEFAULT '0.00',
    66                 `picked_up` tinyint(1) NOT NULL DEFAULT '0',
    67                 `paid` decimal(8,2) NOT NULL DEFAULT '0.00',
    68                 `update_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
    69    
    70                 PRIMARY KEY  (ID)
    71             ) $charset_collate;";
    72             require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
    73             dbDelta($sql);
    74         }
     39        $table_name = $wpdb->prefix."cwscs_inventory";
     40        $sql = "CREATE TABLE IF NOT EXISTS $table_name (
     41            `ID` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
     42            `item_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0',
     43            `item_cat` int(3) DEFAULT '0',
     44            `item_desc` text,
     45            `item_tags` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
     46            `item_retail` int(4) NOT NULL DEFAULT '0' COMMENT 'retail price',
     47            `item_sale` int(4) NOT NULL DEFAULT '0' COMMENT 'price in store',
     48            `item_size` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
     49            `item_colour` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
     50            `item_state` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
     51            `item_image1` int(7) DEFAULT '0',
     52            `item_image2` int(7) DEFAULT '0',
     53            `item_image3` int(7) DEFAULT '0',
     54            `item_image4` int(7) DEFAULT '0',
     55            `seller_name` varchar(150) DEFAULT NULL,
     56            `phone` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
     57            `email` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
     58            `policy_accepted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1=accepted',
     59            `dropoff` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
     60            `sku` varchar(255) NOT NULL DEFAULT '0',
     61            `store_split` tinyint(2) NOT NULL DEFAULT '50' COMMENT 'Split to store',
     62            `reviewer_comments` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
     63            `approved` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1 if approved',
     64            `date_added` date NOT NULL,
     65            `date_sold` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
     66            `sold_price` decimal(8,2) NOT NULL DEFAULT '0.00',
     67            `picked_up` tinyint(1) NOT NULL DEFAULT '0',
     68            `paid` decimal(8,2) NOT NULL DEFAULT '0.00',
     69            `update_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     70            PRIMARY KEY  (ID)
     71        ) $charset_collate;";
     72        dbDelta($sql);
     73       
    7574        // Settings table
    7675        $table_name = $wpdb->prefix . "cwscs_settings";
    77         $charset_collate = $wpdb->get_charset_collate();
    78         $query = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($table_name));
    79         if ($wpdb->get_var($query) != $table_name) {
    80             $sql = "CREATE TABLE $table_name (
    81                 ID int(11) NOT NULL AUTO_INCREMENT,
    82                 cwscs_key varchar(45) DEFAULT NULL,
    83                 cwscs_value text,
    84                 cwscs_type varchar(45) DEFAULT NULL,
    85                 `update_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
    86                 PRIMARY KEY  (ID)
    87             ) $charset_collate;";
    88             require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
    89             dbDelta($sql);
    90         }
     76        $sql = "CREATE TABLE $table_name (
     77            ID int(11) NOT NULL AUTO_INCREMENT,
     78            cwscs_key varchar(45) DEFAULT NULL,
     79            cwscs_value text,
     80            cwscs_type varchar(45) DEFAULT NULL,
     81            `update_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     82            PRIMARY KEY  (ID)
     83        ) $charset_collate;";
     84        dbDelta($sql);
     85       
    9186        // error log table
    9287        $table_name = $wpdb->prefix . "cwscs_errorlog";
    93         $charset_collate = $wpdb->get_charset_collate();
    94         $query = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($table_name));
    95         if ($wpdb->get_var($query) != $table_name) {
    96             $sql = "CREATE TABLE $table_name (
    97                 `ID` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
    98                 `system` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
    99                 `file` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
    100                 `fcn` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
    101                 `url` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
    102                 `msg` text,
    103                 `update_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
    104                 PRIMARY KEY  (ID)
    105             ) $charset_collate;";
    106             require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
    107             dbDelta($sql);
    108         }
     88        $sql = "CREATE TABLE $table_name (
     89            `ID` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
     90            `system` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
     91            `file` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
     92            `fcn` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
     93            `url` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
     94            `msg` text,
     95            `update_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     96            PRIMARY KEY  (ID)
     97        ) $charset_collate;";
     98        dbDelta($sql);
    10999    } // END activate
    110100}

  • consignment-store-for-woocommerce/trunk/includes/class-cws-consignment.php

    r3325813 r3335016  
    7272            $this->version = CWS_CONSIGNMENT_VERSION;
    7373        } else {
    74             $this->version = '2.3';
     74            $this->version = '2.4';
    7575        }
    7676        $this->plugin_name = 'cws-consignment';

  • consignment-store-for-woocommerce/trunk/js/_notes/dwsync.xml

    r3312681 r3335016  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<dwsync>
    3 <file name="cws_custom.js" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133939708800000000" remote="133940666400000000" />
     3<file name="cws_custom.js" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133966464000000000" remote="133981231200000000" />
    44</dwsync>

  • consignment-store-for-woocommerce/trunk/languages/_notes/dwsync.xml

    r3312681 r3335016  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<dwsync>
    3 <file name="cws-consignment.pot" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133939708800000000" remote="133940666400000000" />
     3<file name="cws-consignment.pot" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133966464000000000" remote="133981231200000000" />
    44</dwsync>

  • consignment-store-for-woocommerce/trunk/public/_notes/dwsync.xml

    r3312681 r3335016  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<dwsync>
    3 <file name="class-cws-consignment-public.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133943132790848127" remote="133943241000000000" />
    4 <file name="index.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133939708800000000" remote="133943196600000000" />
     3<file name="class-cws-consignment-public.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133981176255229712" remote="133981284000000000" />
     4<file name="index.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133966464000000000" remote="133981231200000000" />
    55</dwsync>

  • consignment-store-for-woocommerce/trunk/public/class-cws-consignment-public.php

    r3325813 r3335016  
    296296                    $email_settings = cwscsGetMyEmails();
    297297                    if (is_array($email_settings) && count($email_settings) == 2 && $email_settings[1] != "") {
    298                         $from = sanitize_email($email_settings[0]);
    299                         $to = sanitize_email($email_settings[1]);
     298                        $from = $email_settings[0];
     299                        $to = $email_settings[1];
    300300                        if (isset($_POST['item_retail'])) {
    301301                            $item_retail = sanitize_text_field(wp_unslash($_POST['item_retail']));

  • consignment-store-for-woocommerce/trunk/public/css/_notes/dwsync.xml

    r3312681 r3335016  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<dwsync>
    3 <file name="cws-consignment-public.css" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133942277735889958" remote="133943196600000000" />
     3<file name="cws-consignment-public.css" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133966464000000000" remote="133981231200000000" />
    44</dwsync>

  • consignment-store-for-woocommerce/trunk/public/js/_notes/dwsync.xml

    r3312681 r3335016  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<dwsync>
    3 <file name="cws-consignment-public.js" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133944011899064985" remote="133944119400000000" />
    4 <file name="cws-consignment-public-with-resize.js" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133943022670833910" remote="133943196600000000" />
     3<file name="cws-consignment-public-with-resize.js" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133966464000000000" remote="133981231200000000" />
     4<file name="cws-consignment-public.js" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133966464000000000" remote="133981231200000000" />
    55</dwsync>

  • consignment-store-for-woocommerce/trunk/public/partials/_notes/dwsync.xml

    r3312681 r3335016  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<dwsync>
    3 <file name="cws-consignment-public-display.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133939708800000000" remote="133943196600000000" />
     3<file name="cws-consignment-public-display.php" server="ftp.charlenesweb.ca/charlenesweb.ca/" local="133966464000000000" remote="133981231200000000" />
    44</dwsync>
Note: See TracChangeset for help on using the changeset viewer.