Changeset 681590

Timestamp:

03/14/2013 02:15:02 AM (13 years ago)

Author:

withinboredom

Message:

v1.8

Location:

abundatrade-plugin

Files:

• tags/1.8 (copied) (copied from abundatrade-plugin/trunk)
• tags/1.8/abundatrade_pugin.php (modified) (7 diffs)
• tags/1.8/js/abunda_gadgets_short.js (modified) (7 diffs)
• tags/1.8/js/register.js (modified) (2 diffs)
• tags/1.8/js/remote.js (modified) (5 diffs)
• tags/1.8/readme.txt (modified) (2 diffs)
• trunk/abundatrade_pugin.php (modified) (7 diffs)
• trunk/js/abunda_gadgets_short.js (modified) (7 diffs)
• trunk/js/register.js (modified) (2 diffs)
• trunk/js/remote.js (modified) (5 diffs)
• trunk/readme.txt (modified) (2 diffs)

abundatrade-plugin/tags/1.8/abundatrade_pugin.php

@@ -2 +2 @@
 /**
  * @package abundatrade_plugin
- * @version 1.7.7
+ * @version 1.8
  * @author Robert Landers (landers.robert@gmail.com)
  */
@@ -10 +10 @@
 Description: Earn extra income for your site via the Abundatrade affiliate program!
 Author: withinboredom
-Version: 1.7.7
+Version: 1.8
 Author URI: http://withinboredom.info
  */
@@ -90 +90 @@
         $all_valid = false;
         $show_all = "style='display:none'";
+        
+        preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
+
+        $use_labels = false;
+        if (count($matches)>1){
+            //Then we're using IE
+            $version = $matches[1];
+
+            $use_labels = true;
+            switch(true){
+                case ($version<=8):
+                    //IE 8 or under!
+                    $use_labels = true;
+                    break;
+
+                case ($version==9):
+                    //IE9!
+                    $use_labels = true;
+                    break;
+                case ($version == 10):
+                    $use_labels = false;
+                default:
+                //You get the idea
+            }
+        }
+        
+        if (isset($atts['gad_cat'])) {
+            $this->export = array('gad_cat' => $atts['gad_cat']);
+        }
         
         if(isset($_REQUEST['gad_cat'])) {
@@ -188 +217 @@
         else {
             
-            $display = "<form method='get' action='#'><input type='hidden' name='gadget' value='true'/><div id='abundatrade_gadget'>";
+            $display = "<form method='get' action='#'><input type='hidden' id='is_gadget' name='gadget' value='true'/><input type='hidden' name='unknown' value='false'><div id='abundatrade_gadget'>";
             $display .= "<h1 id='finalize' style='display:none'></h1>";
             $display .= "<div class='category_selector select_container'><div id='category_selection' $gad_cat class='selection sel_center'>This form requires javascript. Please use a javascript enabled browser";
@@ -210 +239 @@
             $display .= "<div class='description_container'><div id='description' class='box_center'>";
             $display .= "<p id='desc_desc'>Tell us more about your gadget including complete model #, make, etc...</p>";
-            $display .= "<textarea name='description_entry'></textarea>";
+            $display .= "<textarea name='description_entry' " . ($use_labels ? "rows='10'" : "") . "></textarea>";
             $display .= $closediv . $closediv;
             $display .= "<div id='master_container_contact' $show_all>";
             $display .= "<div class='contact_form_container'><div class='contact_form_thirds'>";
+            if ($use_labels) {
+                $display .= "<label for='my_name'>Your name*</label><br>";
+            }
             $display .= "<input $name type='text' placeholder='Your name*' name='my_name' value='" . $this->get_value("my_name") . "' /><span class='required'>*</span>";
             $display .= $closediv;
             $display .= "<div class='contact_form_thirds'>";
+            if ($use_labels) {
+                $display .= "<label for='email'>Your Email*</label><br>";
+            }
             $display .= "<input $email type='text' placeholder='Your email*' name='email' value='" . $this->get_value("email") . "'/><span class='required'>*</span>";
             $display .= $closediv;
             $display .= "<div class='contact_form_thirds'>";
+            if ($use_labels) {
+                $display .= "<label for='phone'>Your phone #</label><br>";
+            }
             $display .= "<input $phone type='text' placeholder='Your phone #' name='phone' value = '" . $this->get_value("phone") . "'/>";
             $display .= $closediv . $closediv;
             $display .= "<div class='contact_form_container'><div class='contact_form_thirds' style='width:49%'>";
+            if ($use_labels) {
+                $display .= "<label for='address_street'>Address*</label><br>";
+            }
             $display .= "<input $address_street type='text' placeholder='Address*' name='address_street' value='" . $this->get_value("address_street") . "'/><span class='required'>*</span>"; 
             $display .= $closediv;
             $display .= "<div class='contact_form_thirds' style='width:49%'>";
+            if ($use_labels) {
+                $display .= "<label for='address_street_two'>Address Line 2</label><br>";
+            }
             $display .= "<input $address_street_two type='text' placeholder='Address Line 2' name='address_street_two' value='" . $this->get_value("address_street_two") . "'/>";
             $display .= $closediv . $closediv;
             $display .= "<div class='contact_form_container'><div class='contact_form_thirds'>";
+            if ($use_labels) {
+                $display .= "<label for='address_city'>City*</label><br>";
+            }
             $display .= "<input $address_city type='text' placeholder='City*' name='address_city' value='" . $this->get_value("address_city") . "'/><span class='required'>*</span>";
             $display .= $closediv;
             $display .= "<div class='contact_form_thirds'>";
+            if ($use_labels) {
+                $display .= "<label for='address_state'>State*</label><br>";
+            }
             $display .= "<input $address_state type='text' placeholder='State*' name='address_state' value='" . $this->get_value("address_state") . "'/><span class='required'>*</span>";
             $display .= $closediv;
             $display .= "<div class='contact_form_thirds'>";
+            if ($use_labels) {
+                $display .= "<label for='address_zip'>Zip Code*</label><br>";
+            }
             $display .= "<input $address_zip type='text' placeholder='Zip Code*' name='address_zip' value='" . $this->get_value("address_zip") . "'/><span class='required'>*</span>";
             $display .= $closediv . $closediv;
@@ -252 +305 @@
         }
         
-        if ($_GET['gadget'] == true) {
+        if (!isset($this->export)) { 
+            $this->export = array();
+        }
+        
+        $display .= "<script type='text/javascript'> /* <![CDATA[ */ var abundacalc_gad = " . json_encode($this->export) . ";/* ]]> */</script>";
+        
+        if (true) {
             return $display;
         }
@@ -477 +536 @@
         wp_enqueue_script("abundatrade_gadgets");
         $abundacalc = array('server' => 'abundatrade.com', 
-            'url' => $this->folders['PluginUrl'], 
+            'url' => $this->folders['PluginUrl'],
+            'export' => $this->export,
             'thanks' => $this->settings->Thank_you_page);
         if (isset($_REQUEST['upload_id']) && $_REQUEST['upload_id'] != '') {

abundatrade-plugin/tags/1.8/js/abunda_gadgets_short.js

@@ -1 +1 @@
 // JScript File
+
+Object.keys = Object.keys || (function () {
+    var hasOwnProperty = Object.prototype.hasOwnProperty,
+        hasDontEnumBug = !{ toString: null }.propertyIsEnumerable("toString"),
+        DontEnums = [
+            'toString',
+            'toLocaleString',
+            'valueOf',
+            'hasOwnProperty',
+            'isPrototypeOf',
+            'propertyIsEnumerable',
+            'constructor'
+        ],
+        DontEnumsLength = DontEnums.length;
+
+    return function (o) {
+        if (typeof o != "object" && typeof o != "function" || o === null)
+            throw new TypeError("Object.keys called on a non-object");
+
+        var result = [];
+        for (var name in o) {
+            if (hasOwnProperty.call(o, name))
+                result.push(name);
+        }
+
+        if (hasDontEnumBug) {
+            for (var i = 0; i < DontEnumsLength; i++) {
+                if (hasOwnProperty.call(o, DontEnums[i]))
+                    result.push(DontEnums[i]);
+            }
+        }
+
+        return result;
+    };
+})();
 
 function drawCategoryPage(data) {
@@ -126 +161 @@
 var setMan = null;
 
+var unknown = false;
+
 function changeCond() {
     var catID = jQuery("#gad_cat").val();
@@ -287 +324 @@
     if (anyDevice == 'featured') {
         jQuery("#desc_desc").get(0).innerHTML = "Please add any additional information such as detailed condition description and accessories included or not included.";
+        makeUnknown('false');
     }
     else if (anyDevice == 'damaged') {
         jQuery("#desc_desc").get(0).innerHTML = "Please add any additional information such as detailed condition description and accessories included or not included.";
+        makeUnknown('false');
     }
     else {
         jQuery("#desc_desc").get(0).innerHTML = "Please tell us about your gadget including complete model information, detailed condition description, and accessories included or not included.";
+        makeUnknown('true');
     }
     if (!jQuery(".description_container").is(":visible")) {
@@ -341 +381 @@
     }
     return 4;
+}
+
+function makeUnknown(ival) {
+    jQuery("[name='unknown']").val(ival);
+    unknown = ival;
 }
 
@@ -355 +400 @@
             phone: getParameterByName('phone'),
             street: getParameterByName('address_street'),
+            street_two: getParameterByName('address_street_two'),
             city: getParameterByName('address_city'),
             state: getParameterByName('address_state'),
-            zip: getParameterByName('address_zip')
+            zip: getParameterByName('address_zip'),
+            cat: getParameterByName('gad_cat'),
+            dvd: getParameterByName('dvd'),
+            unknown: getParameterByName('unknown')
         }
     });
     
     request.success(function (data) {
-        window.location.href = "http://abundatrade.com/free-cd-dvd-with-gadget-trade.php";
+        if (data.success) {
+            window.location.href = "http://abundatrade.com/free-cd-dvd-with-gadget-trade.php";
+        }
     });
 }
 
 function determineStart() {
-    if (getParameterByName("gadget") == 'true') {
+    if (jQuery("#is_gadget").val() == 'true' || getParameterByName('gadget') == 'true') {
+
+        if (abundacalc_gad.gad_cat) {
+            setCat = abundacalc_gad.gad_cat;
+        }
 
         if (getParameterByName("gad_cat") != "") {
             setCat = getParameterByName("gad_cat");
         }
+
         if (getParameterByName("gad_man") != "") {
             setMan = getParameterByName("gad_man");
@@ -381 +437 @@
             setDev = getParameterByName("gad_dev");
         }
+        if (getParameterByName("ean") != "") {
+            setDev = getParameterByName("ean");
+        }
         if (getParameterByName("gad_cond") != "") {
             setCond = getParameterByName("gad_cond");
@@ -389 +448 @@
 }
 
-jQuery(determineStart());
+jQuery(determineStart);

abundatrade-plugin/tags/1.8/js/register.js

@@ -127 +127 @@
                                 jQuery.prompt.goToState('nomatch');
                             } else if (validateEmail(val['email'], val['confirm_email'])) {
-                                mystate += but;
+                                mystate += 4;
                                 jQuery.prompt.goToState('state' + mystate);
                             }
@@ -133 +133 @@
                                 jQuery.prompt.goToState('invalid');
                             }
-                            return false;
-                        }
-                        else {
-                            just_logging_in = false;
-                            jQuery.prompt.close();
-                        }
-                    }
-                },
-                state2: {
-                    html: passState,
-                    buttons: {Back: -1,Cancel:0, Next: 1},
-                    submit: function (ev, but, message, val) {
-                        mystate = 2;
-                        if (but > 0) {
-                            if (val['password'] != null) {
-                                pass = message.children('password');
-                                conf = message.children('confirmPass');
-                                if (val['password'] != val['confirmPass']) {
-                                    jQuery('#password').css("border", "solid #ff0000 2px");
-                                    jQuery('#confirmPass').css("border", "solid #ff0000 2px");
-                                    jQuery('#badpass').show();
-                                    return false;
-                                }
-                                if (val['password'].length < 8) {
-                                    jQuery("#password").css("border", "solid #ff0000 2px");
-                                    jQuery("#shortpass").show();
-                                    return false;
-                                }
-                            }
-                            if (val['address_zip'] == '') {
-                                jQuery("#address_zip").css("border", "solid #ff0000 2px");
-                                return false;
-                            }
-                            if (val['address_state'] == '') {
-                                jQuery("#address_state").css("border", "solid #ff0000 2px");
-                                return false;
-                            }
-                            if (val['address_city'] == '') {
-                                jQuery("#address_city").css("border", "solid #ff0000 2px");
-                                return false;
-                            }
-                            if (val['address_street'] == '') {
-                                jQuery("#address_street").css("border", "solid #ff0000 2px");
-                                return false;
-                            }
-                        }
-                        
-                        if (but != 0) {
-                            mystate+= but;
-                            jQuery.prompt.goToState('state' + mystate);
-                            return false;
-                        }
-                        just_logging_in = false;
-                        jQuery.prompt.close();
-                    }
-                },
-                state3: {
-                    buttons: { Back: -1, Cancel: 0, Next: 1 },
-                    focus: 2,
-                    submit: function (ev, but, message, val) {
-                        mystate = 3
-                        if (but > 0) {
-
-                            lname = message.children('#referrals');
-                            
-                            if (val['hvReferral'] == '9' && val['txtOther'] == '') {
-                                jQuery('#other').css('border', 'solid #ff0000 2px');
-                                return false;
-                            }
-                            
-                            if (val['hvReferral'] == '3' && val['referred'] == '') {
-                                jQuery('#friend').css('border', 'solid #ff0000 2px');
-                                return false;
-                            }
-
-                            if (val['hvReferral'] == '-1') {
-                                jQuery('#referrals').css("border", "solid #ff0000 2px");
-                                return false;
-                            }
-                            else {
-                                jQuery('#referrals').css("border", "")
-                            }
-                        }
-                        if (but != 0) {
-
-                            if (val['phone_request'] == 'on') {
-                                mystate += but;
-                            }
-                            else {
-                                if (but == 1) {
-                                    mystate += 2;
-                                }
-                                else {
-                                    mystate += but;
-                                }
-                            }
-                            if (mystate == 5 && just_logging_in) {
-                                var str = '';
-                                jQuery.each(val, function (i, obj) {
-                                    str += '&' + i + '=' + obj;
-                                });
-
-                                request = jQuery.ajax(
-                                                        {
-                                                            type: 'POST',
-                                                            url: 'http://' + abundacalc.server + '/trade/process/user/create/',
-                                                            data: '?action=create_user' + str,
-                                                            dataType: 'jsonp'
-                                                        });
-                                request.done(function(data) {
-                                        get_login_status();
-                                        just_logging_in = false;
-                                        jQuery.prompt.close();
-                                        
-                                });
-
-                            }
-                            else {
-                                jQuery.prompt.goToState('state' + mystate);
-                            }
-                            return false;
-                        }
-                        else {
-                            just_logging_in = false;
-                            jQuery.prompt.close();
-                        }
-                    },
-                    html: referral
-                },
-                state4: {
-                    html: phone,
-                    buttons: { Back: -1, Cancel: 0, Next: 1 },
-                    focus: 2,
-                    submit: function (ev, but, message, val) {
-                        mystate = 4;
-                        if (but > 0) {
-                            lname = message.children('#phone_type');
-
-                            if (val['phone_type'] == '') {
-                                lname.css("border", "solid #ff0000 2px");
-                                return false;
-                            }
-                            else {
-                                lname.css("border", "");
-                            }
-                        }
-                        if (but != 0) {
-
-                            var str = '';
-                            mystate += but;
-                            if (mystate == 5 && just_logging_in) {
-                                jQuery.each(val, function (i, obj) {
-                                    str += '&' + i + '=' + obj;
-                                });
-
-                                request = jQuery.ajax(
-                                                        {
-                                                            type: 'POST',
-                                                            url: 'http://' + abundacalc.server + '/trade/process/user/create/',
-                                                            data: '?action=create_user' + str,
-                                                            dataType: 'jsonp'
-                                                        });
-                                request.done(function(data) {
-                                        get_login_status();
-                                        just_logging_in = false;
-                                        jQuery.prompt.close();
-                                        
-                                });
-
-                            }
-                            else {
-                                jQuery.prompt.goToState('state' + mystate);
-                            }
-                            
                             return false;
                         }

abundatrade-plugin/tags/1.8/js/remote.js

@@ -620 +620 @@
             return { Cancel: 0, Login: -1, Register: 1 };
         }
-        return { Cancel: 0, Login: -1, Register: 1, 'Continue as Guest': 2 };
+        return { Cancel: 0, Login: -1, Submit: 1, };
     }
 }
@@ -1094 +1094 @@
 }
 
-/** Submission of a list done the old fashioned way via jsonp */
+/** Submission of a list done the old fashioned way via jsonp ACTUAL SUBMISSION */
 function submit_my_list(f) {
     str = "";
@@ -1101 +1101 @@
         str += '&' + i + '=' + obj;
     });
+
+    str += "&simple=true";
 
     if (isguest) {
@@ -1286 +1288 @@
     {
         title: 'Add it',
-        html: 'Add your item to your working trade list, you can signin, signup, or submit as a guest for an instant quote.',
+        html: 'Add your item to your working trade list, you can signin or submit for an instant quote.',
         buttons: { Done: 2 },
         focus: 1,
@@ -1345 +1347 @@
     {
         title: 'Submit',
-        html: 'Once you\'re done building your list how you want it; login, sign up, or submit the list as a guest; print out your shipping information, and send it in. We will keep you up to date while it goes through the receiving process and get you your cash.',
+        html: 'Once you\'re done building your list how you want it; login or submit the list; print out your shipping information, and send it in. We will keep you up to date while it goes through the receiving process and get you your cash.',
         buttons: { Back: -1, Next: 1 },
         focus: 1,

abundatrade-plugin/tags/1.8/readme.txt

@@ -6 +6 @@
 Requires at least: 3.3
 Tested up to: 3.5
-Stable tag: 1.7.7
+Stable tag: 1.8
 
 Earn extra income for your site via the Abundatrade affiliate program.  The shortcode puts the calculator on your website that shows visitors how much cash they will get for their used CDs, DVDs, and books.
@@ -67 +67 @@
 
 == Changelog ==
+
+= v1.8 =
+
+* Bug Fixes
+* No registration required
 
 = v1.7.7 (Feb 18, 2013) =

abundatrade-plugin/trunk/abundatrade_pugin.php

@@ -2 +2 @@
 /**
  * @package abundatrade_plugin
- * @version 1.7.7
+ * @version 1.8
  * @author Robert Landers (landers.robert@gmail.com)
  */
@@ -10 +10 @@
 Description: Earn extra income for your site via the Abundatrade affiliate program!
 Author: withinboredom
-Version: 1.7.7
+Version: 1.8
 Author URI: http://withinboredom.info
  */
@@ -90 +90 @@
         $all_valid = false;
         $show_all = "style='display:none'";
+        
+        preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
+
+        $use_labels = false;
+        if (count($matches)>1){
+            //Then we're using IE
+            $version = $matches[1];
+
+            $use_labels = true;
+            switch(true){
+                case ($version<=8):
+                    //IE 8 or under!
+                    $use_labels = true;
+                    break;
+
+                case ($version==9):
+                    //IE9!
+                    $use_labels = true;
+                    break;
+                case ($version == 10):
+                    $use_labels = false;
+                default:
+                //You get the idea
+            }
+        }
+        
+        if (isset($atts['gad_cat'])) {
+            $this->export = array('gad_cat' => $atts['gad_cat']);
+        }
         
         if(isset($_REQUEST['gad_cat'])) {
@@ -188 +217 @@
         else {
             
-            $display = "<form method='get' action='#'><input type='hidden' name='gadget' value='true'/><div id='abundatrade_gadget'>";
+            $display = "<form method='get' action='#'><input type='hidden' id='is_gadget' name='gadget' value='true'/><input type='hidden' name='unknown' value='false'><div id='abundatrade_gadget'>";
             $display .= "<h1 id='finalize' style='display:none'></h1>";
             $display .= "<div class='category_selector select_container'><div id='category_selection' $gad_cat class='selection sel_center'>This form requires javascript. Please use a javascript enabled browser";
@@ -210 +239 @@
             $display .= "<div class='description_container'><div id='description' class='box_center'>";
             $display .= "<p id='desc_desc'>Tell us more about your gadget including complete model #, make, etc...</p>";
-            $display .= "<textarea name='description_entry'></textarea>";
+            $display .= "<textarea name='description_entry' " . ($use_labels ? "rows='10'" : "") . "></textarea>";
             $display .= $closediv . $closediv;
             $display .= "<div id='master_container_contact' $show_all>";
             $display .= "<div class='contact_form_container'><div class='contact_form_thirds'>";
+            if ($use_labels) {
+                $display .= "<label for='my_name'>Your name*</label><br>";
+            }
             $display .= "<input $name type='text' placeholder='Your name*' name='my_name' value='" . $this->get_value("my_name") . "' /><span class='required'>*</span>";
             $display .= $closediv;
             $display .= "<div class='contact_form_thirds'>";
+            if ($use_labels) {
+                $display .= "<label for='email'>Your Email*</label><br>";
+            }
             $display .= "<input $email type='text' placeholder='Your email*' name='email' value='" . $this->get_value("email") . "'/><span class='required'>*</span>";
             $display .= $closediv;
             $display .= "<div class='contact_form_thirds'>";
+            if ($use_labels) {
+                $display .= "<label for='phone'>Your phone #</label><br>";
+            }
             $display .= "<input $phone type='text' placeholder='Your phone #' name='phone' value = '" . $this->get_value("phone") . "'/>";
             $display .= $closediv . $closediv;
             $display .= "<div class='contact_form_container'><div class='contact_form_thirds' style='width:49%'>";
+            if ($use_labels) {
+                $display .= "<label for='address_street'>Address*</label><br>";
+            }
             $display .= "<input $address_street type='text' placeholder='Address*' name='address_street' value='" . $this->get_value("address_street") . "'/><span class='required'>*</span>"; 
             $display .= $closediv;
             $display .= "<div class='contact_form_thirds' style='width:49%'>";
+            if ($use_labels) {
+                $display .= "<label for='address_street_two'>Address Line 2</label><br>";
+            }
             $display .= "<input $address_street_two type='text' placeholder='Address Line 2' name='address_street_two' value='" . $this->get_value("address_street_two") . "'/>";
             $display .= $closediv . $closediv;
             $display .= "<div class='contact_form_container'><div class='contact_form_thirds'>";
+            if ($use_labels) {
+                $display .= "<label for='address_city'>City*</label><br>";
+            }
             $display .= "<input $address_city type='text' placeholder='City*' name='address_city' value='" . $this->get_value("address_city") . "'/><span class='required'>*</span>";
             $display .= $closediv;
             $display .= "<div class='contact_form_thirds'>";
+            if ($use_labels) {
+                $display .= "<label for='address_state'>State*</label><br>";
+            }
             $display .= "<input $address_state type='text' placeholder='State*' name='address_state' value='" . $this->get_value("address_state") . "'/><span class='required'>*</span>";
             $display .= $closediv;
             $display .= "<div class='contact_form_thirds'>";
+            if ($use_labels) {
+                $display .= "<label for='address_zip'>Zip Code*</label><br>";
+            }
             $display .= "<input $address_zip type='text' placeholder='Zip Code*' name='address_zip' value='" . $this->get_value("address_zip") . "'/><span class='required'>*</span>";
             $display .= $closediv . $closediv;
@@ -252 +305 @@
         }
         
-        if ($_GET['gadget'] == true) {
+        if (!isset($this->export)) { 
+            $this->export = array();
+        }
+        
+        $display .= "<script type='text/javascript'> /* <![CDATA[ */ var abundacalc_gad = " . json_encode($this->export) . ";/* ]]> */</script>";
+        
+        if (true) {
             return $display;
         }
@@ -477 +536 @@
         wp_enqueue_script("abundatrade_gadgets");
         $abundacalc = array('server' => 'abundatrade.com', 
-            'url' => $this->folders['PluginUrl'], 
+            'url' => $this->folders['PluginUrl'],
+            'export' => $this->export,
             'thanks' => $this->settings->Thank_you_page);
         if (isset($_REQUEST['upload_id']) && $_REQUEST['upload_id'] != '') {

abundatrade-plugin/trunk/js/abunda_gadgets_short.js

@@ -1 +1 @@
 // JScript File
+
+Object.keys = Object.keys || (function () {
+    var hasOwnProperty = Object.prototype.hasOwnProperty,
+        hasDontEnumBug = !{ toString: null }.propertyIsEnumerable("toString"),
+        DontEnums = [
+            'toString',
+            'toLocaleString',
+            'valueOf',
+            'hasOwnProperty',
+            'isPrototypeOf',
+            'propertyIsEnumerable',
+            'constructor'
+        ],
+        DontEnumsLength = DontEnums.length;
+
+    return function (o) {
+        if (typeof o != "object" && typeof o != "function" || o === null)
+            throw new TypeError("Object.keys called on a non-object");
+
+        var result = [];
+        for (var name in o) {
+            if (hasOwnProperty.call(o, name))
+                result.push(name);
+        }
+
+        if (hasDontEnumBug) {
+            for (var i = 0; i < DontEnumsLength; i++) {
+                if (hasOwnProperty.call(o, DontEnums[i]))
+                    result.push(DontEnums[i]);
+            }
+        }
+
+        return result;
+    };
+})();
 
 function drawCategoryPage(data) {
@@ -126 +161 @@
 var setMan = null;
 
+var unknown = false;
+
 function changeCond() {
     var catID = jQuery("#gad_cat").val();
@@ -287 +324 @@
     if (anyDevice == 'featured') {
         jQuery("#desc_desc").get(0).innerHTML = "Please add any additional information such as detailed condition description and accessories included or not included.";
+        makeUnknown('false');
     }
     else if (anyDevice == 'damaged') {
         jQuery("#desc_desc").get(0).innerHTML = "Please add any additional information such as detailed condition description and accessories included or not included.";
+        makeUnknown('false');
     }
     else {
         jQuery("#desc_desc").get(0).innerHTML = "Please tell us about your gadget including complete model information, detailed condition description, and accessories included or not included.";
+        makeUnknown('true');
     }
     if (!jQuery(".description_container").is(":visible")) {
@@ -341 +381 @@
     }
     return 4;
+}
+
+function makeUnknown(ival) {
+    jQuery("[name='unknown']").val(ival);
+    unknown = ival;
 }
 
@@ -355 +400 @@
             phone: getParameterByName('phone'),
             street: getParameterByName('address_street'),
+            street_two: getParameterByName('address_street_two'),
             city: getParameterByName('address_city'),
             state: getParameterByName('address_state'),
-            zip: getParameterByName('address_zip')
+            zip: getParameterByName('address_zip'),
+            cat: getParameterByName('gad_cat'),
+            dvd: getParameterByName('dvd'),
+            unknown: getParameterByName('unknown')
         }
     });
     
     request.success(function (data) {
-        window.location.href = "http://abundatrade.com/free-cd-dvd-with-gadget-trade.php";
+        if (data.success) {
+            window.location.href = "http://abundatrade.com/free-cd-dvd-with-gadget-trade.php";
+        }
     });
 }
 
 function determineStart() {
-    if (getParameterByName("gadget") == 'true') {
+    if (jQuery("#is_gadget").val() == 'true' || getParameterByName('gadget') == 'true') {
+
+        if (abundacalc_gad.gad_cat) {
+            setCat = abundacalc_gad.gad_cat;
+        }
 
         if (getParameterByName("gad_cat") != "") {
             setCat = getParameterByName("gad_cat");
         }
+
         if (getParameterByName("gad_man") != "") {
             setMan = getParameterByName("gad_man");
@@ -381 +437 @@
             setDev = getParameterByName("gad_dev");
         }
+        if (getParameterByName("ean") != "") {
+            setDev = getParameterByName("ean");
+        }
         if (getParameterByName("gad_cond") != "") {
             setCond = getParameterByName("gad_cond");
@@ -389 +448 @@
 }
 
-jQuery(determineStart());
+jQuery(determineStart);

abundatrade-plugin/trunk/js/register.js

@@ -127 +127 @@
                                 jQuery.prompt.goToState('nomatch');
                             } else if (validateEmail(val['email'], val['confirm_email'])) {
-                                mystate += but;
+                                mystate += 4;
                                 jQuery.prompt.goToState('state' + mystate);
                             }
@@ -133 +133 @@
                                 jQuery.prompt.goToState('invalid');
                             }
-                            return false;
-                        }
-                        else {
-                            just_logging_in = false;
-                            jQuery.prompt.close();
-                        }
-                    }
-                },
-                state2: {
-                    html: passState,
-                    buttons: {Back: -1,Cancel:0, Next: 1},
-                    submit: function (ev, but, message, val) {
-                        mystate = 2;
-                        if (but > 0) {
-                            if (val['password'] != null) {
-                                pass = message.children('password');
-                                conf = message.children('confirmPass');
-                                if (val['password'] != val['confirmPass']) {
-                                    jQuery('#password').css("border", "solid #ff0000 2px");
-                                    jQuery('#confirmPass').css("border", "solid #ff0000 2px");
-                                    jQuery('#badpass').show();
-                                    return false;
-                                }
-                                if (val['password'].length < 8) {
-                                    jQuery("#password").css("border", "solid #ff0000 2px");
-                                    jQuery("#shortpass").show();
-                                    return false;
-                                }
-                            }
-                            if (val['address_zip'] == '') {
-                                jQuery("#address_zip").css("border", "solid #ff0000 2px");
-                                return false;
-                            }
-                            if (val['address_state'] == '') {
-                                jQuery("#address_state").css("border", "solid #ff0000 2px");
-                                return false;
-                            }
-                            if (val['address_city'] == '') {
-                                jQuery("#address_city").css("border", "solid #ff0000 2px");
-                                return false;
-                            }
-                            if (val['address_street'] == '') {
-                                jQuery("#address_street").css("border", "solid #ff0000 2px");
-                                return false;
-                            }
-                        }
-                        
-                        if (but != 0) {
-                            mystate+= but;
-                            jQuery.prompt.goToState('state' + mystate);
-                            return false;
-                        }
-                        just_logging_in = false;
-                        jQuery.prompt.close();
-                    }
-                },
-                state3: {
-                    buttons: { Back: -1, Cancel: 0, Next: 1 },
-                    focus: 2,
-                    submit: function (ev, but, message, val) {
-                        mystate = 3
-                        if (but > 0) {
-
-                            lname = message.children('#referrals');
-                            
-                            if (val['hvReferral'] == '9' && val['txtOther'] == '') {
-                                jQuery('#other').css('border', 'solid #ff0000 2px');
-                                return false;
-                            }
-                            
-                            if (val['hvReferral'] == '3' && val['referred'] == '') {
-                                jQuery('#friend').css('border', 'solid #ff0000 2px');
-                                return false;
-                            }
-
-                            if (val['hvReferral'] == '-1') {
-                                jQuery('#referrals').css("border", "solid #ff0000 2px");
-                                return false;
-                            }
-                            else {
-                                jQuery('#referrals').css("border", "")
-                            }
-                        }
-                        if (but != 0) {
-
-                            if (val['phone_request'] == 'on') {
-                                mystate += but;
-                            }
-                            else {
-                                if (but == 1) {
-                                    mystate += 2;
-                                }
-                                else {
-                                    mystate += but;
-                                }
-                            }
-                            if (mystate == 5 && just_logging_in) {
-                                var str = '';
-                                jQuery.each(val, function (i, obj) {
-                                    str += '&' + i + '=' + obj;
-                                });
-
-                                request = jQuery.ajax(
-                                                        {
-                                                            type: 'POST',
-                                                            url: 'http://' + abundacalc.server + '/trade/process/user/create/',
-                                                            data: '?action=create_user' + str,
-                                                            dataType: 'jsonp'
-                                                        });
-                                request.done(function(data) {
-                                        get_login_status();
-                                        just_logging_in = false;
-                                        jQuery.prompt.close();
-                                        
-                                });
-
-                            }
-                            else {
-                                jQuery.prompt.goToState('state' + mystate);
-                            }
-                            return false;
-                        }
-                        else {
-                            just_logging_in = false;
-                            jQuery.prompt.close();
-                        }
-                    },
-                    html: referral
-                },
-                state4: {
-                    html: phone,
-                    buttons: { Back: -1, Cancel: 0, Next: 1 },
-                    focus: 2,
-                    submit: function (ev, but, message, val) {
-                        mystate = 4;
-                        if (but > 0) {
-                            lname = message.children('#phone_type');
-
-                            if (val['phone_type'] == '') {
-                                lname.css("border", "solid #ff0000 2px");
-                                return false;
-                            }
-                            else {
-                                lname.css("border", "");
-                            }
-                        }
-                        if (but != 0) {
-
-                            var str = '';
-                            mystate += but;
-                            if (mystate == 5 && just_logging_in) {
-                                jQuery.each(val, function (i, obj) {
-                                    str += '&' + i + '=' + obj;
-                                });
-
-                                request = jQuery.ajax(
-                                                        {
-                                                            type: 'POST',
-                                                            url: 'http://' + abundacalc.server + '/trade/process/user/create/',
-                                                            data: '?action=create_user' + str,
-                                                            dataType: 'jsonp'
-                                                        });
-                                request.done(function(data) {
-                                        get_login_status();
-                                        just_logging_in = false;
-                                        jQuery.prompt.close();
-                                        
-                                });
-
-                            }
-                            else {
-                                jQuery.prompt.goToState('state' + mystate);
-                            }
-                            
                             return false;
                         }

abundatrade-plugin/trunk/js/remote.js

@@ -620 +620 @@
             return { Cancel: 0, Login: -1, Register: 1 };
         }
-        return { Cancel: 0, Login: -1, Register: 1, 'Continue as Guest': 2 };
+        return { Cancel: 0, Login: -1, Submit: 1, };
     }
 }
@@ -1094 +1094 @@
 }
 
-/** Submission of a list done the old fashioned way via jsonp */
+/** Submission of a list done the old fashioned way via jsonp ACTUAL SUBMISSION */
 function submit_my_list(f) {
     str = "";
@@ -1101 +1101 @@
         str += '&' + i + '=' + obj;
     });
+
+    str += "&simple=true";
 
     if (isguest) {
@@ -1286 +1288 @@
     {
         title: 'Add it',
-        html: 'Add your item to your working trade list, you can signin, signup, or submit as a guest for an instant quote.',
+        html: 'Add your item to your working trade list, you can signin or submit for an instant quote.',
         buttons: { Done: 2 },
         focus: 1,
@@ -1345 +1347 @@
     {
         title: 'Submit',
-        html: 'Once you\'re done building your list how you want it; login, sign up, or submit the list as a guest; print out your shipping information, and send it in. We will keep you up to date while it goes through the receiving process and get you your cash.',
+        html: 'Once you\'re done building your list how you want it; login or submit the list; print out your shipping information, and send it in. We will keep you up to date while it goes through the receiving process and get you your cash.',
         buttons: { Back: -1, Next: 1 },
         focus: 1,

abundatrade-plugin/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 3.3
 Tested up to: 3.5
-Stable tag: 1.7.7
+Stable tag: 1.8
 
 Earn extra income for your site via the Abundatrade affiliate program.  The shortcode puts the calculator on your website that shows visitors how much cash they will get for their used CDs, DVDs, and books.
@@ -67 +67 @@
 
 == Changelog ==
+
+= v1.8 =
+
+* Bug Fixes
+* No registration required
 
 = v1.7.7 (Feb 18, 2013) =