Skip to content

Commit

Permalink
Merged 3.7.6.5 wp-e-commerce release
Browse files Browse the repository at this point in the history
  • Loading branch information
@kasima
kasima committed Jun 24, 2010
2 parents 1303a9d + c4e2879 commit dc3f405
Show file tree
Hide file tree
Showing 218 changed files with 106,118 additions and 18,487 deletions.
1,856 changes: 992 additions & 864 deletions admin-form-functions.php
View file

Large diffs are not rendered by default.

216 changes: 0 additions & 216 deletions admin.css
View file
Expand Up @@ -1267,222 +1267,6 @@ table#itemlist tr.firstrowth td {
padding:4px 5px 6px;
}

/* Main Flora Style Sheet for jQuery UI ui-datepicker */
#ui-datepicker-div, .ui-datepicker-inline {
font-family: Arial,Helvetica,sans-serif;
font-size: 14px;
padding: 0;
margin: 0;
background: #E0F4D7;
width: 185px;
}
#ui-datepicker-div {
display: none;
border: 1px solid #FF9900;
z-index: 10;
}
.ui-datepicker-inline {
float: left;
display: block;
border: 0;
}
.ui-datepicker-rtl {
direction: rtl;
}
.ui-datepicker-dialog {
padding: 5px !important;
border: 4px ridge #83C948 !important;
}
button.ui-datepicker-trigger {
width: 25px;
}
img.ui-datepicker-trigger {
margin: 2px;
vertical-align: middle;
}
.ui-datepicker-prompt {
float: left;
padding: 2px;
background: #E0F4D7;
color: #000;
}
*html .ui-datepicker-prompt {
width: 185px;
}
.ui-datepicker-control, .ui-datepicker-links, .ui-datepicker-header, .ui-datepicker {
clear: both;
float: left;
width: 100%;
color: #FFF;
}
.ui-datepicker-control {
background: #FF9900;
padding: 2px 0px;
}
.ui-datepicker-links {
background: #E0F4D7;
padding: 2px 0px;
}
.ui-datepicker-control, .ui-datepicker-links {
font-weight: bold;
font-size: 80%;
letter-spacing: 1px;
}
.ui-datepicker-links label {
padding: 2px 5px;
color: #888;
}
.ui-datepicker-clear, .ui-datepicker-prev {
float: left;
width: 34%;
}
.ui-datepicker-rtl .ui-datepicker-clear, .ui-datepicker-rtl .ui-datepicker-prev {
float: right;
text-align: right;
}
.ui-datepicker-current {
float: left;
width: 30%;
text-align: center;
}
.ui-datepicker-close, .ui-datepicker-next {
float: right;
width: 34%;
text-align: right;
}
.ui-datepicker-rtl .ui-datepicker-close, .ui-datepicker-rtl .ui-datepicker-next {
float: left;
text-align: left;
}
.ui-datepicker-header {
padding: 1px 0 3px;
background: #83C948;
text-align: center;
font-weight: bold;
height: 1.3em;
}
.ui-datepicker-header select {
background: #83C948;
color: #000;
border: 0px;
font-weight: bold;
}
.ui-datepicker {
background: #CCC;
text-align: center;
font-size: 100%;
}
.ui-datepicker a {
display: block;
width: 100%;
}
.ui-datepicker-title-row {
background: #B1DB87;
color: #000;
}
.ui-datepicker-title-row .ui-datepicker-week-end-cell {
background: #B1DB87;
}
.ui-datepicker-days-row {
background: #FFF;
color: #666;
}
.ui-datepicker-week-col {
background: #B1DB87;
color: #000;
}
.ui-datepicker-days-cell {
color: #000;
border: 1px solid #DDD;
}
.ui-datepicker-days-cell a {
display: block;
}
.ui-datepicker-week-end-cell {
background: #E0F4D7;
}
.ui-datepicker-unselectable {
color: #888;
}
.ui-datepicker-week-over, .ui-datepicker-week-over .ui-datepicker-week-end-cell {
background: #B1DB87 !important;
}
.ui-datepicker-days-cell-over, .ui-datepicker-days-cell-over.ui-datepicker-week-end-cell {
background: #FFF !important;
border: 1px solid #777;
}
* html .ui-datepicker-title-row .ui-datepicker-week-end-cell {
background: #B1DB87 !important;
}
* html .ui-datepicker-week-end-cell {
background: #E0F4D7 !important;
border: 1px solid #DDD !important;
}
* html .ui-datepicker-days-cell-over {
background: #FFF !important;
border: 1px solid #777 !important;
}
* html .ui-datepicker-current-day {
background: #83C948 !important;
}
.ui-datepicker-today {
background: #B1DB87 !important;
}
.ui-datepicker-current-day {
background: #83C948 !important;
}
.ui-datepicker-status {
background: #E0F4D7;
width: 100%;
font-size: 80%;
text-align: center;
}
#ui-datepicker-div a, .ui-datepicker-inline a {
cursor: pointer;
margin: 0;
padding: 0;
background: none;
color: #000;
}
.ui-datepicker-inline .ui-datepicker-links a {
padding: 0 5px !important;
}
.ui-datepicker-control a, .ui-datepicker-links a {
padding: 2px 5px !important;
color: #000 !important;
}
.ui-datepicker-title-row a {
color: #000 !important;
}
.ui-datepicker-control a:hover {
background: #FDD !important;
color: #333 !important;
}
.ui-datepicker-links a:hover, .ui-datepicker-title-row a:hover {
background: #FFF !important;
color: #333 !important;
}
.ui-datepicker-multi .ui-datepicker {
border: 1px solid #83C948;
}
.ui-datepicker-one-month {
float: left;
width: 185px;
}
.ui-datepicker-new-row {
clear: left;
}
.ui-datepicker-cover {
display: none;
display: block;
position: absolute;
z-index: -1;
filter: mask();
top: -4px;
left: -4px;
width: 193px;
height: 200px;
}

/* Affiliates styles */
select#affliate_products {
Expand Down
31 changes: 24 additions & 7 deletions admin.js
View file
Expand Up @@ -235,12 +235,14 @@ jQuery("div.previewimage").hover(
}
);

jQuery("a.closeimagesettings").click(
jQuery(".closeimagesettings").click(
function (e) {
alert('uhuh');
jQuery("div#image_settings_box").hide();
}
);


jQuery("#table_rate_price").click(
function() {
if (this.checked) {
Expand Down Expand Up @@ -588,6 +590,26 @@ jQuery(window).load( function () {
wpsc_save_postboxes_state('products', '.additem');
});

/* Coupon edit functionality */
jQuery('.modify_coupon').hide();
jQuery('.wpsc_edit_coupon').click(function(){
id = jQuery(this).attr('title');
if(jQuery('#'+id).hasClass('displaynone')){
jQuery('#'+id).parent('.modify_coupon').show();
jQuery('#'+id).removeClass('displaynone');
}else{
jQuery('#'+id).addClass('displaynone');
jQuery('#'+id).parent('.modify_coupon').hide();
}

});
jQuery("form[name='add_coupon'] input[name='submit_coupon']").click(function() {
var title = jQuery("form[name='add_coupon'] input[name='add_coupon_code']").val();
if ( title == '') {
alert('Please enter a coupon code.');
return false;
}
});
jQuery('a.closeEl').bind('click', toggleContent);
/*
jQuery('div.groupWrapper').sortable( {
Expand Down Expand Up @@ -777,6 +799,7 @@ jQuery(document).ready(function(){
}
);

/* jQuery datepicker selector */
if (typeof jQuery('.pickdate').datepicker != "undefined") {
jQuery('.pickdate').datepicker({ dateFormat: 'yy-mm-dd' });
}
Expand Down Expand Up @@ -1040,12 +1063,6 @@ function enablebuttons(){
}
);

jQuery("a.closeimagesettings").click(
function (e) {
jQuery("div#image_settings_box").hide();
}
);

function imageorderresults(results) {
eval(results);
jQuery('#gallery_image_'+ser).append(output);
Expand Down
2 changes: 1 addition & 1 deletion currency_converter.inc.php
View file
Expand Up @@ -96,7 +96,7 @@ function convert($amt=NULL,$to="",$from="")

$data = @preg_replace($search, $replace, $data);
@preg_match_all("/(\d[^\.]*(\.\d+)?)/",$data,$mathces);
$return=preg_replace("/[^\d\.]*/","",$mathces[0][1]);
$return=preg_replace("/[^\d\.]*/","",$mathces[0][4]);
return (double)$return;
}
}
Expand Down
8 changes: 4 additions & 4 deletions currency_list.php
View file
Expand Up @@ -84,7 +84,7 @@
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (83, 'Cyprus', 'CY', 'Cyprus Pound', '', '', 'CYP', '0', '0','europe','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (84, 'Cuba', 'CU', 'Cuban Peso', '', '', 'CUP', '0', '0','northamerica','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (85, 'Croatia', 'HR', 'Croatian Kuna', '', '', 'HRK', '0', '0','europe','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (86, 'Costa Rica', 'CR', 'Costa Rican Colon', '', '', 'CRC', '0', '0','southamrica','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (86, 'Costa Rica', 'CR', 'Costa Rican Colon', '', '', 'CRC', '0', '0','southamerica','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (87, 'Cook Islands', 'CK', 'New Zealand Dollar', '$', '$', 'NZD', '0', '0' ,'asiapacific','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (88, 'Congo', 'CG', 'CFA Franc BEAC', '', '', 'XAF', '0', '0','africa','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (89, 'Comoros', 'KM', 'Comoros Franc', '', '', 'KMF', '0', '0','africa','1');
Expand Down Expand Up @@ -221,7 +221,7 @@
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (220, 'Turkmenistan', 'TM', 'Manat', '', '', 'TMM', '0', '0','asiapacific','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (221, 'Turks and Caicos Islands', 'TC', 'US Dollar', '$', '$', 'USD', '0', '0', 'northamerica','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (222, 'Tuvalu', 'TV', 'Australian Dollar', '$', '$', 'AUD', '0', '0','asiapacific','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (223, 'U.K.', 'UK', 'Pound Sterling', '£', '£', 'GBP', '0', '15','europe','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (223, 'U.K.', 'UK', 'Pound Sterling', '£', '£', 'GBP', '0', '17.5','europe','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (224, 'Uganda', 'UG', 'Uganda Shilling', '', '', 'UGS', '0', '0','africa','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (225, 'Ukraine', 'UA', 'Ukraine Hryvnia', '', '', 'UAG', '0', '0','europe','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (226, 'United Arab Emirates', 'AE', 'Arab Emirates Dirham', '', '', 'AED', '0', '0','asiapacific','1');
Expand All @@ -230,7 +230,7 @@
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (229, 'Uzbekistan', 'UZ', 'Uzbekistan Sum', '', '', 'UZS', '0', '0','asiapacific','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (230, 'Vanuatu', 'VU', 'Vanuatu Vatu', '', '', 'VUV', '0', '0','asiapacific','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (231, 'Vatican', 'VA', 'Euro', '€', '€', 'EUR', '0', '0','europe','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (232, 'Venezuela', 'VE', 'Venezuelan Bolivar', '', '', 'VUB', '0', '0','asiapacific','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (232, 'Venezuela', 'VE', 'Venezuelan Bolivar', '', '', 'BsF', '0', '0','asiapacific','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (233, 'Vietnam', 'VN', 'Vietnamese Dong', '', '', 'VND', '0', '0','asiapacific','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (234, 'Virgin Islands (British)', 'VG', 'US Dollar', '$', '$', 'USD', '0', '0','northamerica','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (235, 'Virgin Islands (USA)', 'VI', 'US Dollar', '$', '$', 'USD', '0', '0','northamerica','1');
Expand All @@ -240,4 +240,4 @@
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (239, 'Yugoslavia', 'YU', 'Yugoslav New Dinar', '', '', 'YUN', '0', '0','europe','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (240, 'Zambia', 'ZM', 'Zambian Kwacha', '', '', 'ZMK', '0', '0','africa','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (241, 'Zimbabwe', 'ZW', 'Zimbabwe Dollar', '$', '$', 'ZWD', '0', '0','africa','1');
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (242, 'Deutschland', 'DE', 'Euro', '€', '€', 'EUR', '0', '0','europe','1');";
INSERT INTO `".WPSC_TABLE_CURRENCY_LIST."` VALUES (242, 'Deutschland', 'DE', 'Euro', '€', '€', 'EUR', '0', '0','europe','1');";

0 comments on commit dc3f405

Please sign in to comment.