Changeset 46413

Timestamp:

05/17/08 01:29:10 (2 months ago)

Author:

zackdesign

Message:

1.3.5

Location:

quick-shop

Files:

• tags/1.3.5 (added)
• tags/1.3.5/images (added)
• tags/1.3.5/images/btn_xpressCheckout.gif (added)
• tags/1.3.5/images/cart_go.png (added)
• tags/1.3.5/images/cart_remove.png (added)
• tags/1.3.5/quickshop.php (added)
• tags/1.3.5/readme.txt (added)
• tags/1.3.5/tinymce (added)
• tags/1.3.5/tinymce/cart_add.png (added)
• tags/1.3.5/tinymce/editor_plugin.js (added)
• tags/1.3.5/tinymce/langs (added)
• tags/1.3.5/tinymce/langs/de_de.js (added)
• tags/1.3.5/tinymce/langs/en.js (added)
• tags/1.3.5/tinymce/langs/en_US.js (added)
• tags/1.3.5/tinymce/tinymce.js (added)
• tags/1.3.5/tinymce/tinymce.php (added)
• tags/1.3.5/tinymce/window.php (added)
• tags/1.3.5/tinymce3 (added)
• tags/1.3.5/tinymce3/cart_add.png (added)
• tags/1.3.5/tinymce3/editor_plugin.js (added)
• tags/1.3.5/tinymce3/langs (added)
• tags/1.3.5/tinymce3/langs/de_de.js (added)
• tags/1.3.5/tinymce3/langs/en.js (added)
• tags/1.3.5/tinymce3/langs/en_US.js (added)
• tags/1.3.5/tinymce3/tinymce.js (added)
• tags/1.3.5/tinymce3/tinymce.php (added)
• tags/1.3.5/tinymce3/window.php (added)
• trunk/quickshop.php (modified) (18 diffs)
• trunk/readme.txt (modified) (2 diffs)

quick-shop/trunk/quickshop.php

@@ -5 +5 @@
 Description: Quick and easy shopping cart with widget!
 Author: Isaac Rowntree
-Version: 1.3.4
+Version: 1.3.5
 Author URI: http://zackdesign.biz
 
@@ -91 +91 @@
 function widget_quickshop($args)
 {
-    if (cart_has_items())
+    extract($args);
+      
+      if (cart_has_items())
     {
     $defaultSymbol = get_option('quickshop_symbol');
@@ -116 +118 @@
     if (!$freeshipt || ($freeshipt == '')) $freeshipt = 'Shipping is free for orders of $200 and upwards.';
 
-    extract($args);
+    $title = get_option('quickshop_title');
+      if (($title == '') || !$title ) $title = 'Your Shopping Cart';
     
     echo $before_widget;
     echo '<div class="quickshopcart" style="padding: 5px;">';
-    echo $before_title . 'Your Shopping Cart' . $after_title;
-    
-    echo '<br /><form method="post" action=""><table style="width: 100%;">';
+    echo $before_title . $title . $after_title;
+    
+    echo '<br /><span id="info" style="display: none; font-weight: bold; color: red;">Hit tab or enter to submit new QTY.</span><form method="post" action=""><table style="width: 100%;">';
     
     $count = 1;
@@ -139 +142 @@
         
         <tr><td style='overflow: hidden;'><a href='".get_permalink($item['postID'])."'>".$item['name']."</a></td>
-        <td style='text-align: center'><form method=\"post\"  action=\"\" style='display: inline'>
+        <td style='text-align: center'><form method=\"post\" name='cquantity'  action=\"\" style='display: inline'>
         <input type='hidden' name='product' value='".$item['name']."' />
         
-        <input type='hidden' name='cquantity' value='1' /><input type='text' name='quantity' value='".$item['quantity']."' size='1' /></form></td>
+        <input type='hidden' name='cquantity' value='1' /><input type='text' name='quantity' value='".$item['quantity']."' size='1' onchange='document.cquantity.submit();' onkeypress='document.getElementById(\"info\").style.display = \"\";' /></form></td>
         <td style='text-align: center'>".output_currency(($item['price'] * $item['quantity']),$symbol, $decimal)."</td>
         <td><form method=\"post\"  action=\"\">
@@ -196 +199 @@
     
     }
+      else
+      {
+          $display  = get_option('quickshop_display');
+            if ($display)
+            {
+                $displayt = get_option('quickshop_displayt');
+                  $title = get_option('quickshop_title');
+                  if (($title == '') || !$title ) $title = 'Your Shopping Cart';
+                if (($displayt == '') || !$displayt ) $displayt = 'Your Shopping Cart is empty';
+                echo $before_widget.'<div class="quickshopcart" style="padding: 5px;">'.$before_title . $title . $after_title.'<p>'.$displayt.'<p></div>'.$after_widget;
+            }
+      }
 }
 
 function widget_quickshoppaypal($args)
 {
-    if (cart_has_items())
-    {
-    
     extract($args);
+      
+      if (cart_has_items())
+    {
+    
+    
     
     $email = get_bloginfo('admin_email');
@@ -230 +247 @@
     $freeshipt = get_option('quickshop_freeshipt');
     if (!$freeshipt || ($freeshipt == '')) $freeshipt = 'Shipping is free for orders of $200 and upwards.';
+      
+      $title = get_option('quickshop_title');
+      if (($title == '') || !$title ) $title = 'Your Shopping Cart';
     
     echo $before_widget;
     echo '<div class="quickshopcart" style=" padding: 5px;">';
-    echo $before_title . 'Your Shopping Cart' . $after_title;
-    
-    echo '<br /><table style="width: 100%;">';
+    echo $before_title . $title . $after_title;
+    
+    echo '<br /><span id="pinfo" style="display: none; font-weight: bold; color: red;">Hit tab or enter to submit new QTY.</span><table style="width: 100%;">';
     
     $count = 1;
@@ -256 +276 @@
         
         <tr><td style='overflow: hidden;'><a href='".get_permalink($item['postID'])."'>".$item['name']."</a></td>
-        <td style='text-align: center'><form method=\"post\"  action=\"\" style='display: inline'>
+        <td style='text-align: center'><form method=\"post\"  action=\"\" name='pcquantity' style='display: inline'>
         <input type='hidden' name='product' value='".$item['name']."' />
         
-        <input type='hidden' name='cquantity' value='1' /><input type='text' name='quantity' value='".$item['quantity']."' size='1' /></form></td>
+        <input type='hidden' name='cquantity' value='1' /><input type='text' name='quantity' value='".$item['quantity']."' size='1' onchange='document.pcquantity.submit();' onkeypress='document.getElementById(\"pinfo\").style.display = \"\";' /></form></td>
         <td style='text-align: center'>".output_currency(($item['price'] * $item['quantity']), $paypal_symbol, $decimal)."</td>
         <td><form method=\"post\"  action=\"\">
@@ -331 +351 @@
 
     }
+      else
+      {
+          $display  = get_option('quickshop_display');
+            if ($display)
+            {
+                $displayt = get_option('quickshop_displayt');
+                  $title = get_option('quickshop_title');
+                  if (($title == '') || !$title ) $title = 'Your Shopping Cart';
+                if (($displayt == '') || !$displayt ) $displayt = 'Your Shopping Cart is empty';
+                echo $before_widget.'<div class="quickshopcart" style="padding: 5px;">'.$before_title . $title . $after_title.'<p>'.$displayt.'<p></div>'.$after_widget;
+            }
+      }
 }
 
@@ -345 +377 @@
 {
     
-    $addcart = get_option('quickshop_add_cart');
+    $addcart = get_option('quickshop_addcart');
     
     if (!$addcart || ($addcart == '') )
@@ -391 +423 @@
 
      echo '<div class="wrap"><h2>QuickShop Options</h2>';
-     if ($_REQUEST['submitform']) {
-          //update_quickshop_options();
-     }
      print_quickshop_form();
      echo '</div>';
 
-}
-
-function update_quickshop_options() {
-     $updated = false;
-
-          update_option('quickshop_currency', $_REQUEST['currency']);
-          update_option('quickshop_churl', $_REQUEST['churl']);
-          update_option('quickshop_symbol', $_REQUEST['symbol']);
-          update_option('quickshop_decimal', $_REQUEST['decimal']);
-          update_option('quickshop_pemail', $_REQUEST['pemail']);
-          update_option('quickshop_add_cart', $_REQUEST['addcart']);
-          if (!$_REQUEST['total'])
-              $_REQUEST['total'] = 0;
-          if (!$_REQUEST['display'])
-              $_REQUEST['display'] = 0;
-          update_option('quickshop_display', $_REQUEST['display']);
-          update_option('quickshop_total', $_REQUEST['total']);
-          update_option('quickshop_location', $_REQUEST['location']);
-          update_option('quickshop_freeshipv', $_REQUEST['freeshipv']);
-          update_option('quickshop_freeshipt', $_REQUEST['freeshipt']);
-          $updated = true;
-     
-
-     if ($updated) {
-           echo '<div id="message" class="updated fade">';
-           echo '<p>Options Updated</p>';
-           echo '</div>';
-      } else {
-           echo '<div id="message" class="error fade">';
-           echo '<p>Unable to update options</p>';
-           echo '</div>';
-      }
 }
 
@@ -442 +439 @@
     $defaultChURL = get_option('quickshop_churl');
     if (!$defaultChURL || ($defaultChURL == '')) $defaultChURL = 'contact';
-    $addcart = get_option('quickshop_add_cart');
-    if (!$addcart || ($addcart == '')) $addcart = 'Add to Cart';
+    $addcart = get_option('quickshop_addcart');
+    if ($addcart == '') $addcart = 'Add to Cart';
     
     if (get_option('quickshop_display'))
@@ -463 +460 @@
     if (!$freeshipv || ($freeshipv == '')) $freeshipv = '0';
     $freeshipt = get_option('quickshop_freeshipt');
-    if (!$freeshipt || ($freeshipt == '')) $freeshipt = 'Shipping is free for orders of $200 and upwards.';
+    if (($freeshipt == '') || !$freeshipt) $freeshipt = 'Shipping is free for orders of $200 and upwards.';
+      $displayt = get_option('quickshop_displayt');
+      if (($displayt == '') || !$displayt) $displayt = 'Your cart is empty.';
+      
+      $title = get_option('quickshop_title');
+      if (($title == '') || !$title) $title = 'Your Shopping Cart';
     
 
@@ -471 +473 @@
  echo '
  <table class="form-table">
+ <tr valign="top">
+<th scope="row">Shopping Cart title</th>
+<td><input type="text" name="quickshop_title" value="'.$title.'"  /></td>
+</tr>
 <tr valign="top">
 <th scope="row">Currency</th>
@@ -487 +493 @@
 <tr valign="top">
 <th scope="row">Display Shopping Cart when Empty?</th>
-<td><input type="checkbox" name="quickshop_display" value="1" '.$checked.' /></td>
+<td><input type="checkbox" name="quickshop_display" value="1" '.$checked.' /> - Text to display when empty: <input type="text" name="quickshop_displayt" value="'.$displayt.'" size="70" /></td>
 </tr>
 <tr valign="top">
@@ -526 +532 @@
 <tr valign="top">
 <th scope="row">Notification text</th>
-<td><input type="text" name="quickshop_reeshipt" value="'.$freeshipt.'" size="100" /></td>
+<td><input type="text" name="quickshop_freeshipt" value="'.$freeshipt.'" size="100" /></td>
 </tr>
 </table>
@@ -533 +539 @@
 <input type="submit" name="Submit" value="Update Options &raquo;" />
 <input type="hidden" name="action" value="update" />
-<input type="hidden" name="page_options" value="quickshop_currency,quickshop_churl,quickshop_symbol,quickshop_decimal,quickshop_pemail,quickshop_addcart,quickshop_total,quickshop_display,quickshop_location,quickshop_freeshipv,quickshop_freeshipt" />
+<input type="hidden" name="page_options" value="quickshop_currency,quickshop_churl,quickshop_symbol,quickshop_decimal,quickshop_pemail,quickshop_addcart,quickshop_total,quickshop_display,quickshop_location,quickshop_freeshipv,quickshop_freeshipt,quickshop_displayt,quickshop_title" />
 </p>
 
       
-<h3>Like what you see? Are you Australian?</h3>
-<p><a href="http://ozedeals.biz">Please help support Zack Design and the author of Quick Shop by shopping online for hardware, 
-software, tuition, notebooks, and desktop PCs at our online site. We offer great prices and better support.</a></p>
-<p>Not to mention we have also developed solutions for multiple monitors, seamless integration between 
-computer systems so you can control multiple systems at once, and more!</p>
+<h3>Do you like QuickShop?</h3>
+<h4>Websites</h4>
+<p>Zack Design has completed many websites, themes, and plugins. This one is free for you to use and has been perfected over countless hours. Please either <a href="http://zackdesign.biz/wp-plugins/34">donate</a> or <a href="http://zackdesign.biz/">consider using Zack Design for your next project!</a></p>
+<h4>Computers</h4>
+<p><a href="http://ozedeals.biz">ozEdeals.biz</a> is a new shop Zack Design has opened on-line using QuickShop for all to see. (Note: Shipping to Australian residents only)</p>
+<h4>VirtualBox, Synergy, more than 2 Desktop Monitors, Networks, Linux and more!</h4>
+<p>Zack Design knows all the tricks when it comes to setting up your office with multiple monitors, seamlessly integrating multiple PCs with different operating systems, virtual machines like VirtualBox for emulating Windows or Linux on your desktop, and can setup and configure wireless and wired networks as well as network servers easily. <a href="http://zackdesign.biz/contact">Contact us today to increase your productivity!</a></p>
 
  </form>
@@ -566 +574 @@
 function cart_has_items()
 {
-    if (get_option('quickshop_display'))
-        return 1;
-    else 
-    {
         $count = 0;
         if (isset($_SESSION['qscart']) && is_array($_SESSION['qscart']))
@@ -579 +583 @@
         else
             return 0;
-    }
 }
 

quick-shop/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 2.3
 Tested up to: 2.5
-Stable tag: 1.3.4
+Stable tag: 1.3.5
 
 QuickShop has two shopping-cart widgets, automatically adds buttons to your posts, and includes a TinyMCE editor button.
@@ -102 +102 @@
 == Latest Changes ==
 
-Changelog:
+1.3.5
+
+- Fixed numerous bugs in admin section as well as adding the ability to change the widget title
+- Added javascript key checking and form submission to QTY changing field to make it less likely to fail - should work everywhere now!
 
 1.3.4