forked from jghazally/WP-e-Commerce
-
Notifications
You must be signed in to change notification settings - Fork 0
/
956.5.diff
2472 lines (2442 loc) · 88.7 KB
/
956.5.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git wpsc-admin/admin.php wpsc-admin/admin.php
index 8261192..a91acba 100644
--- wpsc-admin/admin.php
+++ wpsc-admin/admin.php
@@ -401,7 +401,8 @@ function wpsc_meta_boxes() {
add_meta_box( 'wpsc_additional_desc', __('Additional Description', 'wpsc'), 'wpsc_additional_desc', $pagename, 'normal', 'high' );
add_meta_box( 'wpsc_product_download_forms', __('Product Download', 'wpsc'), 'wpsc_product_download_forms', $pagename, 'normal', 'high' );
add_meta_box( 'wpsc_product_image_forms', __('Product Images', 'wpsc'), 'wpsc_product_image_forms', $pagename, 'normal', 'high' );
- add_meta_box( 'wpsc_product_shipping_forms', __('Shipping', 'wpsc'), 'wpsc_product_shipping_forms', $pagename, 'normal', 'high' );
+ if ( ! empty( $post->ID ) && ! wpsc_product_has_variations( $post->ID ) )
+ add_meta_box( 'wpsc_product_shipping_forms', __('Shipping', 'wpsc'), 'wpsc_product_shipping_forms_metabox', $pagename, 'normal', 'high' );
add_meta_box( 'wpsc_product_advanced_forms', __('Advanced Settings', 'wpsc'), 'wpsc_product_advanced_forms', $pagename, 'normal', 'high' );
}
@@ -409,7 +410,7 @@ function wpsc_meta_boxes() {
add_action( 'admin_footer', 'wpsc_meta_boxes' );
add_action( 'admin_enqueue_scripts', 'wpsc_admin_include_css_and_js_refac' );
function wpsc_admin_include_css_and_js_refac( $pagehook ) {
- global $post_type, $current_screen;
+ global $post_type, $current_screen, $post;
if ( version_compare( get_bloginfo( 'version' ), '3.3', '<' ) )
wp_admin_css( 'dashboard' );
@@ -430,7 +431,7 @@ function wpsc_admin_include_css_and_js_refac( $pagehook ) {
$version_identifier = WPSC_VERSION . "." . WPSC_MINOR_VERSION;
$pages = array( 'index.php', 'options-general.php', 'edit.php', 'post.php', 'post-new.php' );
- if ( ( in_array( $pagehook, $pages ) && $post_type == 'wpsc-product' ) || $current_screen->id == 'edit-wpsc_product_category' || $current_screen->id == 'dashboard_page_wpsc-sales-logs' || $current_screen->id == 'dashboard_page_wpsc-purchase-logs' || $current_screen->id == 'settings_page_wpsc-settings' || $current_screen->id == 'wpsc-product_page_wpsc-edit-coupons' || $current_screen->id == 'edit-wpsc-variation' ) {
+ if ( ( in_array( $pagehook, $pages ) && $post_type == 'wpsc-product' ) || $current_screen->id == 'edit-wpsc_product_category' || $current_screen->id == 'dashboard_page_wpsc-sales-logs' || $current_screen->id == 'dashboard_page_wpsc-purchase-logs' || $current_screen->id == 'settings_page_wpsc-settings' || $current_screen->id == 'wpsc-product_page_wpsc-edit-coupons' || $current_screen->id == 'edit-wpsc-variation' || $current_screen->id == 'wpsc-product-variations-iframe' ) {
wp_enqueue_script( 'livequery', WPSC_URL . '/wpsc-admin/js/jquery.livequery.js', array( 'jquery' ), '1.0.3' );
wp_enqueue_script( 'wp-e-commerce-admin-parameters', admin_url( 'admin.php?wpsc_admin_dynamic_js=true' ), false, $version_identifier );
wp_enqueue_script( 'wp-e-commerce-admin', WPSC_URL . '/wpsc-admin/js/admin.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-sortable' ), $version_identifier, false );
@@ -446,6 +447,7 @@ function wpsc_admin_include_css_and_js_refac( $pagehook ) {
array( // args
'add_variation_set_nonce' => _wpsc_create_ajax_nonce( 'add_variation_set' ),
'update_variations_nonce' => _wpsc_create_ajax_nonce( 'update_variations' ),
+ 'thickbox_title' => __( 'Add Media - %s', 'wpsc' ),
)
);
}
@@ -458,6 +460,25 @@ function wpsc_admin_include_css_and_js_refac( $pagehook ) {
'l10n_print_after' => 'try{convertEntities(wpsc_adminL10n);}catch(e){};'
) );
}
+
+ if ( $pagehook == 'wpsc-product-variations-iframe' ) {
+ wp_enqueue_script( 'wp-e-commerce-product-variations', WPSC_URL . '/wpsc-admin/js/product-variations.js', array( 'jquery' ), $version_identifier );
+ wp_localize_script( 'wp-e-commerce-product-variations', 'WPSC_Product_Variations', array(
+ 'product_id' => $_REQUEST['product_id'],
+ ) );
+ }
+
+ if ( $pagehook == 'media-upload-popup' ) {
+ wp_dequeue_script( 'set-post-thumbnail' );
+ wp_enqueue_script( 'wpsc-set-post-thumbnail', WPSC_URL . '/wpsc-admin/js/set-post-thumbnail.js', array( 'jquery' ), $version_identifier );
+ wp_localize_script( 'wpsc-set-post-thumbnail', 'WPSC_Set_Post_Thumbnail', array(
+ 'link_text' => __( 'Use as Product Thumbnail', 'wpsc' ),
+ 'saving' => __( 'Saving...' ),
+ 'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),
+ 'done' => __( 'Done' ),
+ ) );
+ }
+
if ( 'dashboard_page_wpsc-upgrades' == $pagehook || 'dashboard_page_wpsc-update' == $pagehook )
wp_enqueue_style( 'wp-e-commerce-admin', WPSC_URL . '/wpsc-admin/css/admin.css', false, $version_identifier, 'all' );
}
diff --git wpsc-admin/ajax.php wpsc-admin/ajax.php
index 4a02ec4..7d089c2 100644
--- wpsc-admin/ajax.php
+++ wpsc-admin/ajax.php
@@ -80,6 +80,15 @@ function _wpsc_ajax_handler() {
}
add_action( 'wp_ajax_wpsc_ajax', '_wpsc_ajax_handler' );
+function wpsc_is_doing_ajax( $action = '' ) {
+ $ajax = defined( 'DOING_AJAX' ) && DOING_AJAX && ! empty( $_REQUEST['action'] ) && $_REQUEST['action'] == 'wpsc_ajax';
+
+ if ( $action )
+ $ajax = $ajax && ! empty( $_REQUEST['wpsc_action'] ) && $ajax_action == str_replace( '-', '_', $_REQUEST['wpsc_action'] );
+
+ return $ajax;
+}
+
/**
* Helper function that generates nonce for an AJAX action. Basically just a wrapper of
* wp_create_nonce() but automatically add prefix.
@@ -554,7 +563,7 @@ function _wpsc_ajax_upload_product_file() {
* @return array|WP_Error Response args if successful, WP_Error if otherwise
*/
function _wpsc_ajax_update_variations() {
- $product_id = absint( $_POST["product_id"] );
+ $product_id = absint( $_REQUEST["product_id"] );
wpsc_update_variations();
ob_start();
@@ -574,4 +583,41 @@ function _wpsc_action_tinymce_window() {
require_once( WPSC_CORE_JS_PATH . '/tinymce3/window.php' );
exit;
}
-add_action( 'wp_ajax_wpsc_tinymce_window', '_wpsc_action_tinymce_window' );
\ No newline at end of file
+add_action( 'wp_ajax_wpsc_tinymce_window', '_wpsc_action_tinymce_window' );
+
+function wpsc_product_variations_table() {
+ check_admin_referer( 'wpsc_product_variations_table' );
+ require_once( WPSC_FILE_PATH . '/wpsc-admin/includes/product-variations-page.class.php' );
+ $page = new WPSC_Product_Variations_Page();
+ $page->display();
+
+ exit;
+}
+add_action( 'wp_ajax_wpsc_product_variations_table', 'wpsc_product_variations_table' );
+
+function _wpsc_ajax_set_variation_product_thumbnail() {
+ $response = array(
+ 'success' => false
+ );
+
+ $post_ID = intval( $_POST['post_id'] );
+ if ( current_user_can( 'edit_post', $post_ID ) ) {
+ $thumbnail_id = intval( $_POST['thumbnail_id'] );
+ check_ajax_referer( "set_post_thumbnail-$post_ID" );
+
+ if ( $thumbnail_id == '-1' )
+ delete_post_thumbnail( $post_ID );
+
+ set_post_thumbnail( $post_ID, $thumbnail_id );
+
+ $thumbnail = wpsc_the_product_thumbnail( 50, 50, $post_ID, '' );
+ if ( ! $thumbnail )
+ $thumbnail = WPSC_CORE_IMAGES_URL . '/no-image-uploaded.gif';
+ $response['src'] = $thumbnail;
+ $response['success'] = true;
+ }
+
+ echo json_encode( $response );
+ exit;
+}
+add_action( 'wp_ajax_wpsc_set_variation_product_thumbnail', '_wpsc_ajax_set_variation_product_thumbnail' );
\ No newline at end of file
diff --git wpsc-admin/css/admin.css wpsc-admin/css/admin.css
index e81b5d4..cb953f6 100644
--- wpsc-admin/css/admin.css
+++ wpsc-admin/css/admin.css
@@ -1987,4 +1987,186 @@ table.purchase-logs .column-id .delete {
table.purchase-logs tr:hover .column-id .delete {
visibility:visible;
+}
+
+/* Product Variations */
+.no-js #wpsc_product_variation_forms iframe {
+ height:300px;
+}
+
+.js #wpsc_product_variation_forms iframe {
+ border:0;
+ margin:0;
+ overflow:hidden;
+ padding:0;
+}
+
+#wpsc_product_variation_forms iframe {
+ background:transparent;
+ width:100%;
+}
+
+#wpsc-product-variations-wrapper .tablenav.top {
+ margin-top:0;
+}
+
+.wpsc-save-variations-top {
+ float:right;
+ margin:8px 0 5px;
+}
+
+#wpsc-product-variations-wrapper .column-stock input[type="text"],
+#wpsc-product-variations-wrapper .column-tax input[type="text"],
+#wpsc-product-variations-wrapper .column-price input[type="text"],
+#wpsc-product-variations-wrapper .column-sale_price input[type="text"],
+#wpsc-product-variations-wrapper .column-sku input[type="text"] {
+ width:100%;
+
+ box-sizing:border-box;
+ -o-box-sizing:border-box;
+ -moz-box-sizing:border-box;
+ -webkit-box-sizing:border-box;
+}
+
+#wpsc-product-variations-wrapper .inline-edit-row.column-stock input[type="text"],
+#wpsc-product-variations-wrapper .inline-edit-row.column-tax input[type="text"],
+#wpsc-product-variations-wrapper .inline-edit-row.column-price input[type="text"],
+#wpsc-product-variations-wrapper .inline-edit-row.column-sale_price input[type="text"],
+#wpsc-product-variations-wrapper .inline-edit-row.column-sku input[type="text"] {
+ width: 60%;
+}
+
+#wpsc-product-variations-wrapper .column-stock, #wpsc-product-variations-wrapper .column-tax, #wpsc-product-variations-wrapper .column-price, #wpsc-product-variations-wrapper .column-sale_price, #wpsc-product-variations-wrapper .column-sku {
+ text-align:center;
+ width:11%;
+}
+
+#wpsc-product-variations-wrapper .column-stock input,
+#wpsc-product-variations-wrapper .column-tax input,
+#wpsc-product-variations-wrapper .column-price input,
+#wpsc-product-variations-wrapper .column-sale_price input,
+#wpsc-product-variations-wrapper .column-sku input {
+ text-align:right;
+}
+
+.js #wpsc-product-variations-wrapper tbody .active td, .js #wpsc-product-variations-wrapper tbody .active th {
+ border-bottom-style:dashed;
+}
+
+.js #wpsc-product-variations-wrapper tbody td, .js #wpsc-product-variations-wrapper tbody th {
+ border-bottom-style:solid;
+}
+
+#wpsc-product-variations-wrapper div.updated,
+#wpsc-product-variations-wrapper div.error {
+ margin: 15px 0 2px;
+}
+
+.js #wpsc-product-variations-wrapper .wpsc-stock-editor-row {
+ display:none;
+}
+
+#wpsc-product-variations-wrapper .wpsc-stock-editor-row td {
+ border-bottom-style:solid;
+}
+
+#wpsc-product-variations-wrapper .submit {
+ margin:0;
+ padding:0;
+}
+
+.wpsc-stock-editor .inside {
+ overflow:hidden;
+}
+
+.wpsc-stock-editor .wpsc-product-shipping-section {
+ display:inline-block;
+ vertical-align: top;
+ width:49%;
+}
+
+.wpsc-stock-editor .wpsc-form-field {
+ clear:both;
+}
+
+.wpsc-stock-editor .wpsc-product-shipping-section input[type="text"] {
+ text-align:right;
+ width:50px;
+}
+
+.wpsc-product-shipping-weight-dimensions label {
+ display:inline-block;
+ min-width:60px;
+}
+
+.wpsc-product-shipping-flat-rate label {
+ display:inline-block;
+ min-width:160px;
+}
+
+.wpsc-stock-editor {
+ overflow:hidden;
+}
+
+.wpsc-stock-editor select {
+ min-width:100px;
+}
+
+#wpsc_product_variation_forms .inside {
+ background: #fff;
+ padding: 0;
+ margin: 0;
+}
+
+.wpsc-product-variations-tabs {
+ background: #F1F1F1;
+ border-bottom: 1px solid #ccc;
+ padding: 10px 10px 0;
+ margin: 0;
+}
+
+.wpsc-product-variations-tabs li {
+ display: inline-block;
+ margin: 0 4px 2px 0;
+}
+
+.wpsc-product-variations-tabs a {
+ background-color: #fff;
+ border-color: #ccc #ccc #fff;
+ border-style: solid;
+ border-width: 1px 1px 0;
+ color: #aaa;
+ padding: 5px 7px 3px;
+ text-decoration: none;
+
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
+ -webkit-border-top-left-radius: 3px;
+ -webkit-border-top-right-radius: 3px;
+ -moz-border-top-left-radius: 3px;
+ -moz-border-top-right-radius: 3px;
+}
+
+.wpsc-product-variations-tabs a:hover {
+ color: #D54E21;
+}
+
+.wpsc-product-variations-tabs .active a {
+ border-bottom-width: 1px;
+ color: #333;
+ margin-bottom: 2px;
+}
+
+.wpsc-product-variations-tab-content {
+ padding: 0 10px;
+}
+
+.wpsc-product-variation-thumbnail {
+ float: left;
+ height: 50px;
+ width: 50px;
+}
+
+.wpsc-product-variation-title {
+ margin-left: 60px;
}
\ No newline at end of file
diff --git wpsc-admin/display-items.page.php wpsc-admin/display-items.page.php
index cb1d0c6..d4a3013 100755
--- wpsc-admin/display-items.page.php
+++ wpsc-admin/display-items.page.php
@@ -47,25 +47,7 @@ function wpsc_additional_sortable_column_names( $columns ){
return $columns;
}
-function wpsc_additional_column_name_variations( $columns ){
- global $post;
-
- if(isset($post) && $post->post_parent != '0' )
- remove_meta_box( 'wpsc_product_variation_forms', 'wpsc-product', 'normal' );
-
- $columns['image'] = '';
- $columns['title'] = __('Name', 'wpsc');
- $columns['weight'] = __('Weight', 'wpsc');
- $columns['stock'] = __('Stock', 'wpsc');
- $columns['price'] = __('Price', 'wpsc');
- $columns['sale_price'] = __('Sale Price', 'wpsc');
- $columns['SKU'] = __('SKU', 'wpsc');
- $columns['hidden_alerts'] = '';
- //For BC for 3.0 (hoping to remove for WPEC 3.9)
- register_column_headers( 'wpsc-product_variants', $columns );
- return apply_filters( 'wpsc_variation_column_headers', $columns);
-}
/**
* wpsc_additional_column_data.
@@ -343,7 +325,6 @@ function wpsc_sortable_column_load() {
}
add_action( 'load-edit.php', 'wpsc_sortable_column_load' );
-add_action( 'admin_head', 'wpsc_additional_column_name_variations' );
add_action( 'restrict_manage_posts', 'wpsc_cats_restrict_manage_posts' );
add_action( 'manage_pages_custom_column', 'wpsc_additional_column_data', 10, 2 );
add_filter( 'manage_edit-wpsc-product_sortable_columns', 'wpsc_additional_sortable_column_names' );
diff --git wpsc-admin/includes/display-items-functions.php wpsc-admin/includes/display-items-functions.php
index e52c344..795fb66 100644
--- wpsc-admin/includes/display-items-functions.php
+++ wpsc-admin/includes/display-items-functions.php
@@ -385,263 +385,165 @@ function wpsc_product_taxes_forms() {
}
function wpsc_product_variation_forms() {
- require_once( 'walker-variation-checklist.php' );
- global $post, $wpdb, $wp_query, $variations_processor, $wpsc_product_defaults;
-
- $db_version = get_option( 'db_version' );
-
- $product_data = get_post_custom( $post->ID );
- $product_data['meta'] = maybe_unserialize( $product_data );
-
- foreach ( $product_data['meta'] as $meta_key => $meta_value )
- $product_data['meta'][$meta_key] = $meta_value[0];
-
- $product_meta = array();
- if ( !empty( $product_data["_wpsc_product_metadata"] ) )
- $product_meta = maybe_unserialize( $product_data["_wpsc_product_metadata"][0] );
-
- $siteurl = get_option( 'siteurl' );
- $output = '';
-?>
- <a name="#wpsc_variation_metabox"></a>
- <?php if ( empty( $post->post_title ) ) : ?>
- <p><?php _e( 'You must first save this Product as a Draft before adding variations.', 'wpsc' ); ?></p>
- <h4><a href="<?php echo get_admin_url(); ?>/edit-tags.php?taxonomy=wpsc-variation&post_type=wpsc-product" target="_blank">+ Add New Variation Set</a></h4>
- <?php else : ?>
- <div id="product_variations">
- <p><a name='variation_control'> </a><?php _e( 'Select the Variation sets and then the corresponding Variants you want to add to this product.', 'wpsc' ) ?></p>
-
- <ul class="variation_checkboxes">
- <?php
-
- wp_terms_checklist( $post->ID, array(
- 'taxonomy' => 'wpsc-variation',
- 'walker' => new WPSC_Walker_Variation_Checklist(),
- 'checked_ontop' => false,
- ) );
-
- ?>
- </ul>
-
- <p class="update-variations">
- <a class="button update_variations_action" href='#'><?php _e( 'Apply Variations →', 'wpsc' ); ?></a>
- <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" /><br class="clear" />
- </p>
-
- <div class="clear"></div>
- <h4><a href="#wpsc_variation_metabox" class="add_variation_set_action"><?php esc_html_e( '+ Add New Variants', 'wpsc' ) ?></a></h4>
-
- <div id="add-new-variation-set">
- <p>
- <label for="new-variation-set-name"><?php esc_html_e( "Enter variation set's name", 'wpsc' ); ?></label>
- <input type="text" class="text-field" id="new-variation-set-name" /><br />
- </p>
- <p class="howto"><?php esc_html_e( "Example: Color. If you want to add variants to an existing set, you can enter the name of that set here.", 'wpsc' ); ?></p>
- <p>
- <label for="new-variants"><?php esc_html_e( "Enter new variants", 'wpsc' ); ?></label>
- <input type="text" class="text-field" id="new-variants" /><br />
- </p>
- <p class="howto"><?php esc_html_e( "Example: Red, Green, Blue. Separate variants with commas.", 'wpsc' ); ?></p>
- <p>
- <a class="button" href="#"><?php esc_html_e( 'Add New Variants', 'wpsc' ); ?></a>
- <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" /><br class="clear" />
- </p>
- </div>
- </div>
+ ?>
+ <iframe src="<?php echo _wpsc_get_product_variation_form_url(); ?>"></iframe>
<?php
- $parent_product = $post->ID;
-
- $query = array(
- 'post_type' => 'wpsc-product',
- 'orderby' => 'menu_order post_title',
- 'post_parent' => $parent_product,
- 'post_status' => 'publish, inherit',
- 'order' => 'ASC'
- );
-
- $args = array(
- 'post_type' => 'attachment',
- 'numberposts' => 1,
- 'post_status' => null,
- 'post_parent' => $parent_product,
- 'orderby' => 'menu_order',
- 'order' => 'ASC'
- );
-
- $image_data = (array)get_posts( $args );
- $parent_product_data['image'] = array_shift( $image_data );
-
- if ( !isset( $parent_product_data ) )
- $parent_product_data = null;
-?>
- <table class="widefat page" id='wpsc_product_list' cellspacing="0">
- <thead>
- <tr>
- <?php print_column_headers( 'wpsc-product_variants' ); ?>
- </tr>
- </thead>
-
- <tfoot>
- <tr>
- <?php print_column_headers( 'wpsc-product_variants', false ); ?>
- </tr>
- </tfoot>
-
- <tbody>
- <?php
- wpsc_admin_product_listing( $parent_product_data, $query );
- ?>
- </tbody>
-
- </table>
-
- <?php
- endif;
-
- // reset the global $id variable. This is to prevent incompatibility with Genesis framework,
- // which (wrongly) relies on this global.
- $GLOBALS['id'] = null;
}
-function wpsc_product_shipping_forms() {
- global $post, $wpdb, $variations_processor, $wpsc_product_defaults;
- $product_data = get_post_custom( $post->ID );
- $product_data['meta'] = maybe_unserialize( $product_data );
+function _wpsc_get_product_variation_form_url( $id = false ) {
+ if ( ! $id )
+ $id = get_the_ID();
+ return admin_url( 'admin-ajax.php?action=wpsc_product_variations_table&product_id=' . $id . '&_wpnonce=' . wp_create_nonce( 'wpsc_product_variations_table' ) );
+}
- foreach ( $product_data['meta'] as $meta_key => $meta_value )
- $product_data['meta'][$meta_key] = $meta_value[0];
+function wpsc_product_shipping_forms_metabox() {
+ wpsc_product_shipping_forms();
+}
- $product_meta = array();
- if ( !empty( $product_data["_wpsc_product_metadata"] ) )
- $product_meta = maybe_unserialize( $product_data["_wpsc_product_metadata"][0] );
+function wpsc_product_shipping_forms( $product = false, $field_name_prefix = 'meta[_wpsc_product_metadata]', $bulk = false ) {
+ if ( ! $product )
+ $product_id = get_the_ID();
+ else
+ $product_id = $product->ID;
+
+ $meta = get_post_meta( $product_id, '_wpsc_product_metadata', true );
+ $defaults = array(
+ 'weight' => '',
+ 'weight_unit' => '',
+ 'dimensions' => array(),
+ 'shipping' => array(),
+ 'no_shipping' => '',
+ 'display_weight_as' => '',
+ );
+ $dimensions_defaults = array(
+ 'height_unit' => '',
+ 'width_unit' => '',
+ 'length_unit' => '',
+ 'height' => 0,
+ 'width' => 0,
+ 'length' => 0,
+ );
+ $shipping_defaults = array(
+ 'local' => '',
+ 'international' => '',
+ );
+ $meta = array_merge( $defaults, $meta );
+ $meta['dimensions'] = array_merge( $dimensions_defaults, $meta['dimensions'] );
+ $meta['shipping'] = array_merge( $shipping_defaults, $meta['shipping'] );
- $product_data['transformed'] = array();
- if ( !isset( $product_meta['weight'] ) )
- $product_meta['weight'] = "";
+ extract( $meta, EXTR_SKIP );
- if( !isset( $product_meta['weight_unit'] ) )
- $product_meta['weight_unit'] = '';
+ foreach ( $shipping as $key => &$val ) {
+ $val = number_format( (float) $val, 2 );
+ }
- $product_data['transformed']['weight'] = wpsc_convert_weight( $product_meta['weight'], "pound", $product_meta['weight_unit']);
+ $weight = wpsc_convert_weight( $weight, 'pound', $weight_unit );
- // Fix wp_debug notices
- if(!isset($product_meta['dimensions'])){
- $product_meta['dimensions'] = array(
- 'height' => 0,
- 'width' => 0,
- 'length' => 0
- );
- }
- if( !isset($product_meta['display_weight_as']) )
- $product_meta['display_weight_as'] = '';
+ $dimension_units = array(
+ 'in' => __( 'inches', 'wpsc' ),
+ 'cm' => __( 'cm', 'wpsc' ),
+ 'meter' => __( 'meters', 'wpsc' )
+ );
- if( !isset( $product_meta['dimensions']['height_unit'] ) )
- $product_meta['dimensions']['height_unit'] = '';
+ $weight_units = array(
+ 'pound' => __( 'pounds', 'wpsc' ),
+ 'ounce' => __( 'ounces', 'wpsc' ),
+ 'gram' => __( 'grams', 'wpsc' ),
+ 'kilogram' => __( 'kilograms', 'wpsc' )
+ );
- if( !isset( $product_meta['dimensions']['width_unit'] ) )
- $product_meta['dimensions']['width_unit'] = '';
+ $measurements = $dimensions;
+ $measurements['weight'] = $weight;
+ $measurements['weight_unit'] = $weight_unit;
- if( !isset( $product_meta['dimensions']['length_unit'] ) )
- $product_meta['dimensions']['length_unit'] = '';
+ $measurement_fields = array(
+ array(
+ 'name' => 'weight',
+ 'prefix' => '',
+ 'label' => __( 'Weight', 'wpsc' ),
+ 'value' => $weight,
+ 'units' => $weight_units,
+ ),
+ array(
+ 'name' => 'height',
+ 'prefix' => '[dimensions]',
+ 'label' => __( 'Height', 'wpsc' ),
+ 'value' => $dimensions['height'],
+ 'units' => $dimension_units,
+ ),
+ array(
+ 'name' => 'width',
+ 'prefix' => '[dimensions]',
+ 'label' => __( 'Width', 'wpsc' ),
+ 'value' => $dimensions['width'],
+ 'units' => $dimension_units,
+ ),
+ array(
+ 'name' => 'length',
+ 'prefix' => '[dimensions]',
+ 'label' => __( 'Length', 'wpsc' ),
+ 'value' => $dimensions['length'],
+ 'units' => $dimension_units,
+ ),
+ );
+ $tabindex = 106;
+ if ( isset( $product->index ) )
+ $tabindex += $product->index * 20;
+?>
+ <div class="wpsc-stock-editor<?php if ( $bulk ) echo ' wpsc-bulk-edit' ?>">
+ <p class="wpsc-form-field">
+ <label><?php esc_html_e( 'Disregard Shipping for this Product', 'wpsc' ); ?></label>
+ <label><input tabindex="<?php echo $tabindex; ?>" type="radio" name="<?php echo $field_name_prefix ?>[no_shipping]" value="1" <?php checked( $no_shipping && ! $bulk ); ?> /> <?php echo esc_html_x( 'Yes', 'disregard shipping', 'wpsc' ); ?></label>
+ <label><input tabindex="<?php echo $tabindex + 1; ?>" type="radio" name="<?php echo $field_name_prefix ?>[no_shipping]" value="0" <?php checked( ! $no_shipping && ! $bulk ); ?> /> <?php echo esc_html_x( 'No', 'disregard shipping', 'wpsc' ); ?></label>
+ </p>
+
+ <div class="wpsc-product-shipping-section wpsc-product-shipping-weight-dimensions">
+ <p><strong><?php esc_html_e( 'Weight and Dimensions', 'wpsc' ); ?></strong></p>
+ <?php
+ foreach ( $measurement_fields as $field ):
+ $tabindex += 2;
+ ?>
+ <p class="wpsc-form-field">
+ <?php if ( $bulk ): ?>
+ <input class="wpsc-bulk-edit-fields" type="checkbox" name="wpsc_bulk_edit[fields][measurements][<?php echo $field['name'] ?>]" value="1" />
+ <?php endif ?>
+ <label for="wpsc-product-shipping-<?php echo $field['name']; ?>"><?php echo esc_html( $field['label'] ); ?></label>
+ <span class="wpsc-product-shipping-input">
+ <input tabindex="<?php echo $tabindex; ?>" type="text" id="wpsc-product-shipping-<?php echo $field['name']; ?>" name="<?php echo $field_name_prefix . $field['prefix'] . '[' . $field['name'] . ']'; ?>" value="<?php if ( ! $bulk ) echo esc_attr( $field['value'] ); ?>" />
+ <select tabindex="<?php echo $tabindex + 1; ?>" name="<?php echo $field_name_prefix . $field['prefix'] . '[' . $field['name'] . '_unit]'; ?>">
+ <?php foreach ( $field['units'] as $unit => $unit_label ): ?>
+ <option value="<?php echo $unit; ?>" <?php if ( ! $bulk ) selected( $unit, $measurements[$field['name'] . '_unit'] ); ?>><?php echo esc_html( $unit_label ); ?></option>
+ <?php endforeach; ?>
+ </select>
+ </span>
+ </p>
+ <?php
+ endforeach;
+ $tabindex += 2;
+ ?>
+ </div>
- if( !isset( $product_meta['shipping'] ) ){
- $product_meta['shipping']['local'] = '';
- $product_meta['shipping']['international'] = '';
- }
- if( !isset( $product_meta['no_shipping'] ) )
- $product_meta['no_shipping'] = '';
-?> <a name="wpsc_shipping"></a>
- <table>
-
- <!--USPS shipping changes-->
- <tr>
- <td>
- <?php _e( 'Weight', 'wpsc' ); ?>
- </td>
- <td>
- <input type='text' size='5' name='meta[_wpsc_product_metadata][weight]' value='<?php echo $product_data['transformed']['weight']; ?>' />
- <select name='meta[_wpsc_product_metadata][weight_unit]'>
- <option value='pound' <?php echo ( ( $product_meta['display_weight_as'] == 'pound' ) ? 'selected="selected"' : '' ); ?> ><?php _e( 'Pounds', 'wpsc' ); ?></option>
- <option value='ounce' <?php echo ( ( preg_match( "/o(u)?nce/", $product_meta['display_weight_as'] ) ) ? 'selected="selected"' : '' ); ?> ><?php _e( 'Ounces', 'wpsc' ); ?></option>
- <option value='gram' <?php echo ( ( $product_meta['display_weight_as'] == 'gram' ) ? 'selected="selected"' : '' ); ?> ><?php _e( 'Grams', 'wpsc' ); ?></option>
- <option value='kilogram' <?php echo ( ( $product_meta['display_weight_as'] == 'kilogram' || $product_meta['display_weight_as'] == 'kilograms' ) ? 'selected="selected"' : '' ); ?> ><?php _e( 'Kilograms', 'wpsc' ); ?></option>
- </select>
- </td>
- </tr>
- <!--dimension-->
- <tr>
- <td>
- <?php _e( 'Height', 'wpsc' ); ?>
- </td>
- <td>
- <input type='text' size='5' name='meta[_wpsc_product_metadata][dimensions][height]' value= '<?php echo $product_meta['dimensions']['height'] ; ?>'>
- <select name='meta[_wpsc_product_metadata][dimensions][height_unit]'>
- <option value='in' <?php echo ( ( $product_meta['dimensions']['height_unit'] == 'in' ) ? 'selected' : '' ); ?> ><?php _e( 'inches', 'wpsc' ); ?></option>
- <option value='cm' <?php echo ( ( $product_meta['dimensions']['height_unit'] == 'cm' ) ? 'selected' : '' ); ?> ><?php _e( 'cm', 'wpsc' ); ?></option>
- <option value='meter' <?php echo ( ( $product_meta['dimensions']['height_unit'] == 'meter' ) ? 'selected' : '' ); ?> ><?php _e( 'meter', 'wpsc' ); ?></option>
- </select>
- </td>
- </tr>
- <tr>
- <td>
- <?php _e( 'Width', 'wpsc' ); ?>
- </td>
- <td>
- <input type='text' size='5' name='meta[_wpsc_product_metadata][dimensions][width]' value='<?php echo $product_meta['dimensions']['width']; ?> '>
- <select name='meta[_wpsc_product_metadata][dimensions][width_unit]'>
- <option value='in' <?php echo( ( $product_meta['dimensions']['width_unit'] == 'in' ) ? 'selected' : '' ); ?> ><?php _e( 'inches', 'wpsc' ); ?></option>
- <option value='cm' <?php echo ( ( $product_meta['dimensions']['width_unit'] == 'cm' ) ? 'selected' : '' ); ?> ><?php _e( 'cm', 'wpsc' ); ?></option>
- <option value='meter' <?php echo ( ( $product_meta['dimensions']['width_unit'] == 'meter' ) ? 'selected' : '' ); ?> ><?php _e( 'meter', 'wpsc' ); ?></option>
- </select>
- </td>
- </tr>
- <tr>
- <td>
- <?php _e( 'Length', 'wpsc' ); ?>
- </td>
- <td>
- <input type='text' size='5' name='meta[_wpsc_product_metadata][dimensions][length]' value='<?php echo $product_meta['dimensions']['length']; ?>'>
- <select name='meta[_wpsc_product_metadata][dimensions][length_unit]'>
- <option value='in' <?php echo( ( $product_meta['dimensions']['length_unit'] == 'in' ) ? 'selected' : '' ); ?> ><?php _e( 'inches', 'wpsc' ); ?></option>
- <option value='cm' <?php echo( ( $product_meta['dimensions']['length_unit'] == 'cm' ) ? 'selected' : '' ); ?> ><?php _e( 'cm', 'wpsc' ); ?></option>
- <option value='meter' <?php echo ( ( $product_meta['dimensions']['length_unit'] == 'meter' ) ? 'selected' : '' ); ?> ><?php _e( 'meter', 'wpsc' ); ?></option>
- </select>
- </td>
- </tr>
-
- <!--//dimension-->
- <!--USPS shipping changes ends-->
- <tr>
- <td colspan='2'>
- <strong><?php _e( 'Flat Rate Settings', 'wpsc' ); ?></strong>
- </td>
- </tr>
- <tr>
- <td>
- <?php _e( 'Local Shipping Fee', 'wpsc' ); ?>
- </td>
- <td>
- <input type='text' size='10' name='meta[_wpsc_product_metadata][shipping][local]' value='<?php echo number_format( (float)$product_meta['shipping']['local'], 2, '.', '' ); ?>' />
- </td>
- </tr>
-
- <tr>
- <td>
- <?php _e( 'International Shipping Fee', 'wpsc' ); ?>
- </td>
- <td>
- <input type='text' size='10' name='meta[_wpsc_product_metadata][shipping][international]' value='<?php echo number_format( (float)$product_meta['shipping']['international'], 2, '.', '' ); ?>' />
- </td>
- </tr>
- <tr>
- <td>
- <br />
- <input id='add_form_no_shipping' type='checkbox' name='meta[_wpsc_product_metadata][no_shipping]' value='1' <?php echo ( ( $product_meta['no_shipping'] == 1 ) ? 'checked="checked"' : '' ); ?> /> <label for='add_form_no_shipping'><?php _e( 'Disregard Shipping for this Product', 'wpsc' ); ?></label>
- </td>
- </tr>
- </table>
+ <div class="wpsc-product-shipping-section wpsc-product-shipping-flat-rate">
+ <p><strong><?php esc_html_e( 'Flat Rate Settings', 'wpsc' ); ?></strong></p>
+ <p class="wpsc-form-field">
+ <?php if ( $bulk ): ?>
+ <input class="wpsc-bulk-edit-fields" type="checkbox" name="wpsc_bulk_edit[fields][shipping][local]" value="1" />
+ <?php endif; ?>
+ <label for="wpsc-product-shipping-flatrate-local"><?php esc_html_e( 'Local Shipping Fee', 'wpsc' ); ?></label>
+ <input tabindex="<?php echo $tabindex; ?>" type="text" id="wpsc-product-shipping-flatrate-local" name="<?php echo $field_name_prefix; ?>[shipping][local]" value="<?php if ( ! $bulk ) echo $shipping['local']; ?>" />
+ </p>
+ <p class="wpsc-form-field">
+ <?php if ( $bulk ): ?>
+ <input class="wpsc-bulk-edit-fields" type="checkbox" name="wpsc_bulk_edit[fields][shipping][international]" value="1" />
+ <?php endif; ?>
+ <label for="wpsc-product-shipping-flatrate-international"><?php esc_html_e( 'International Shipping Fee', 'wpsc' ); ?></label>
+ <input tabindex="<?php echo $tabindex + 1; ?>" type="text" id="wpsc-product-shipping-flatrate-international" name="<?php echo $field_name_prefix; ?>[shipping][international]" value="<?php if ( ! $bulk ) echo $shipping['international']; ?>" />
+ </p>
+ </div>
+ </div>
<?php
}
+
function wpsc_product_advanced_forms() {
global $post, $wpdb, $variations_processor, $wpsc_product_defaults;
$product_data = get_post_custom( $post->ID );
@@ -881,8 +783,8 @@ function change_context( $context ) {
}
function change_link( $link ) {
global $post_ID, $current_screen;
-
- if ( $current_screen->id != 'wpsc-product' )
+ $current_screen = get_current_screen();
+ if ( $current_screen && $current_screen->id != 'wpsc-product' )
return $link;
$uploading_iframe_ID = $post_ID;
diff --git wpsc-admin/includes/product-functions.php wpsc-admin/includes/product-functions.php
index dfc053a..ccb8247 100644
--- wpsc-admin/includes/product-functions.php
+++ wpsc-admin/includes/product-functions.php
@@ -185,7 +185,7 @@ function wpsc_pre_update( $data , $postarr ) {
$data["post_parent"] = $postarr["parent_post"];
// Sanitize status for variations (see #324)
- if ( $data['post_parent'] && ( ! isset( $data['ID'] ) || $data['post_parent'] != $data['ID'] ) ) {
+ if ( $data['post_parent'] && ( ! isset( $data['ID'] ) || $data['post_parent'] != $data['ID'] ) && $data['post_status'] == 'publish' ) {
$data['post_status'] = 'inherit';
}
@@ -531,14 +531,15 @@ function wpsc_edit_product_variations($product_id, $post_data) {
$variation_sets_and_values = apply_filters('wpsc_edit_product_variation_sets_and_values', $variation_sets_and_values, $product_id);
wp_set_object_terms($product_id, $variation_sets_and_values, 'wpsc-variation');
+ $parent_id = $_REQUEST['product_id'];
+
$child_product_template = array(
'post_author' => $user_ID,
- 'post_content' => $post_data['description'],
- 'post_excerpt' => $post_data['additional_description'],
- 'post_title' => $post_data['name'],
+ 'post_content' => get_post_field( 'post_content', $parent_id, 'raw' ),
+ 'post_excerpt' => get_post_field( 'post_excerpt', $parent_id, 'raw' ),
+ 'post_title' => get_post_field( 'post_title', $parent_id, 'raw' ),
'post_status' => 'inherit',
'post_type' => "wpsc-product",
- 'post_name' => sanitize_title($post_data['name']),
'post_parent' => $product_id
);
diff --git wpsc-admin/includes/product-variation-list-table.class.php wpsc-admin/includes/product-variation-list-table.class.php
new file mode 100644
index 0000000..2a9faf6
--- /dev/null
+++ wpsc-admin/includes/product-variation-list-table.class.php
@@ -0,0 +1,609 @@
+<?php
+
+require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+require_once( ABSPATH . 'wp-admin/includes/class-wp-posts-list-table.php' );
+
+class WPSC_Product_Variation_List_Table extends WP_List_Table
+{
+ private $product_id;
+ private $object_terms_cache = array();
+ private $args = array();
+ private $is_trash = false;
+ private $is_draft = false;
+ private $is_publish = false;
+ private $is_all = true;
+ private $is_bulk_edit = false;
+ private $bulk_edited_items = array();
+ private $bulk_edited_item_ids = array();
+
+ public function __construct( $product_id ) {
+ WP_List_Table::__construct( array(
+ 'plural' => 'variations',
+ ) );
+
+ $this->product_id = $product_id;
+ if ( isset( $_REQUEST['post_status'] ) ) {
+ $this->is_trash = $_REQUEST['post_status'] == 'trash';
+ $this->is_draft = $_REQUEST['post_status'] == 'draft';
+ $this->is_publish = $_REQUEST['post_status'] == 'publish';
+ $this->is_all = $_REQUEST['post_status'] == 'all';
+ } else {
+ $this->is_all = true;
+ }
+ }
+
+ public function prepare_items() {
+ if ( ! empty( $this->items ) )
+ return;
+
+ $this->args = array(
+ 'post_type' => 'wpsc-product',
+ 'orderby' => 'menu_order post_title',
+ 'post_parent' => $this->product_id,
+ 'post_status' => 'publish, inherit',
+ 'numberposts' => -1,
+ 'order' => "ASC",
+ );
+
+ if ( isset( $_REQUEST['post_status'] ) )
+ $this->args['post_status'] = $_REQUEST['post_status'];
+
+ if ( isset( $_REQUEST['s'] ) )
+ $this->args['s'] = $_REQUEST['s'];
+
+ $this->items = get_posts( $this->args );
+
+ if ( empty( $this->items ) )
+ return;
+
+ $ids = wp_list_pluck( $this->items, 'ID' );
+ $object_terms = wp_get_object_terms( $ids, 'wpsc-variation', array( 'fields' => 'all_with_object_id' ) );
+ foreach ( $object_terms as $term ) {
+ if ( ! array_key_exists( $term->object_id, $this->object_terms_cache ) )
+ $this->object_terms_cache[$term->object_id] = array();
+
+ $this->object_terms_cache[$term->object_id][$term->parent] = $term->name;
+ }
+ }
+
+ public function get_hidden_columns() {
+ return array();
+ }
+
+ /**
+ * Get a list of all, hidden and sortable columns, with filter applied
+ *
+ * @since 3.1.0
+ * @access protected
+ *
+ * @return array
+ */
+ public function get_column_info() {
+ if ( isset( $this->_column_headers ) )
+ return $this->_column_headers;
+
+ $screen = get_current_screen();
+
+ $columns = $this->get_columns();
+ $hidden = $this->get_hidden_columns();
+ $_sortable = $this->get_sortable_columns();
+
+ $sortable = array();
+ foreach ( $_sortable as $id => $data ) {
+ if ( empty( $data ) )
+ continue;
+
+ $data = (array) $data;
+ if ( !isset( $data[1] ) )
+ $data[1] = false;
+
+ $sortable[$id] = $data;
+ }
+
+ $this->_column_headers = array( $columns, $hidden, $sortable );
+
+ return $this->_column_headers;
+ }
+
+ public function get_columns() {
+ return array(
+ 'cb' => '<input type="checkbox" />',
+ 'title' => __( 'Title', 'wpsc' ),
+ 'stock' => __( 'Stock', 'wpsc' ),
+ 'tax' => __( 'Tax', 'wpsc' ),
+ 'price' => __( 'Price', 'wpsc' ),
+ 'sale_price' => __( 'Sale Price', 'wpsc' ),
+ 'sku' => __( 'SKU', 'wpsc' ),
+ );
+ }
+
+ public function get_sortable_columns() {
+ return array();
+ }
+
+ public function column_cb( $item ) {
+ $checked = isset( $_REQUEST['variations'] ) ? checked( in_array( $item->ID, $_REQUEST['variations'] ), true, false ) : '';
+ $tabindex = 1000 + $item->index;
+ return sprintf(
+ '<input tabindex="%1$s" type="checkbox" %2$s name="%3$s[]" value="%4$s" />',
+ /*$1%s*/ $tabindex,
+ /*$2%s*/ $checked,
+ /*$3%s*/ 'post',
+ /*$4%s*/ $item->ID
+ );
+ }
+
+ private function get_row_actions( $item ) {
+ $post_type_object = get_post_type_object( 'wpsc-product' );
+ $can_edit_post = current_user_can( $post_type_object->cap->edit_post, $item->ID );
+
+ $actions = array();
+ if ( apply_filters( 'wpsc_product_variations_edit_action', false, $item ) && $can_edit_post && 'trash' != $item->post_status )
+ $actions['edit'] = '<a href="' . get_edit_post_link( $item->ID, true ) . '" title="' . esc_attr( __( 'Edit this item' ), 'wpsc' ) . '">' . __( 'Edit' ) . '</a>';
+
+ $actions['stock hide-if-no-js'] = '<a class="wpsc-variation-stock-editor-link" href="#" title="' . __( 'Show shipping editor', 'wpsc' ) . '">' . __( 'Edit Shipping', 'wpsc' ) . '</a>';
+
+ if ( $item->post_status == 'draft' ) {
+ $show_url = add_query_arg( array(
+ 'bulk_action' => 'show',
+ 'post' => $item->ID,
+ 'bulk_action_nonce' => wp_create_nonce( 'wpsc_product_variations_bulk_action' ),
+ ) );
+ $actions['show'] = '<a class="wpsc-variation-show-link" href="' . $show_url . '" title="' . __( 'Show this variation on the front-end', 'wpsc' ) . '">' . __( 'Publish', 'wpsc' ) . '</a>';
+ } elseif ( in_array( $item->post_status, array( 'publish', 'inherit' ) ) ) {
+ $hide_url = add_query_arg( array(
+ 'bulk_action' => 'hide',
+ 'post' => $item->ID,
+ 'bulk_action_nonce' => wp_create_nonce( 'wpsc_product_variations_bulk_action' ),
+ ) );
+ $actions['hide'] = '<a class="wpsc-variation-hide-link" href="' . $hide_url . '" title="' . __( 'Mark this variation as draft to hide from the front-end', 'wpsc' ) . '">' . __( 'Mark as Draft', 'wpsc' ) . '</a>';
+ }
+
+ if ( current_user_can( $post_type_object->cap->delete_post, $item->ID ) ) {
+ $force_delete = 'trash' == $item->post_status || ! EMPTY_TRASH_DAYS;
+ $redirect_url = urlencode( _wpsc_get_product_variation_form_url( $this->product_id ) );
+ $delete_link = add_query_arg( '_wp_http_referer', $redirect_url, get_delete_post_link( $item->ID, '', $force_delete ) );
+
+ if ( 'trash' == $item->post_status ) {
+ $restore_url = admin_url( sprintf( $post_type_object->_edit_link, $item->ID ) );