Changeset 1697860
- Timestamp:
- 07/18/2017 06:08:41 AM (9 years ago)
- Location:
- wpmerchant
- Files:
-
- 16 added
- 12 edited
-
assets/screenshot-1.png (modified) (previous)
-
assets/screenshot-10.png (added)
-
assets/screenshot-11.png (added)
-
assets/screenshot-12.png (added)
-
assets/screenshot-13.png (added)
-
assets/screenshot-14.png (added)
-
assets/screenshot-15.png (added)
-
assets/screenshot-16.png (added)
-
assets/screenshot-17.png (added)
-
assets/screenshot-18.png (added)
-
assets/screenshot-19.png (added)
-
assets/screenshot-2.png (modified) (previous)
-
assets/screenshot-20.png (added)
-
assets/screenshot-21.png (added)
-
assets/screenshot-22.png (added)
-
assets/screenshot-23.png (added)
-
assets/screenshot-3.png (modified) (previous)
-
assets/screenshot-4.png (modified) (previous)
-
assets/screenshot-5.png (modified) (previous)
-
assets/screenshot-6.png (modified) (previous)
-
assets/screenshot-7.png (modified) (previous)
-
assets/screenshot-8.png (added)
-
assets/screenshot-9.png (added)
-
trunk/README.txt (modified) (1 diff)
-
trunk/admin/class-wpmerchant-admin.php (modified) (1 diff)
-
trunk/includes/class-wpmerchant.php (modified) (3 diffs)
-
trunk/public/class-wpmerchant-public.php (modified) (4 diffs)
-
trunk/wpmerchant.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
wpmerchant/trunk/README.txt
r1697545 r1697860 167 167 == Screenshots == 168 168 169 1. WPMerchant General Settings Page 170 2. WPMerchant Payment Settings Page. Connect to your Stripe Account with One Click. 171 3. WPMerchant Mailing List Settings Page 172 4. List of WPMerchant Products 173 5. WPMerchant Product General Data 174 6. WPMerchant Product Inventory Data 175 7. WPMerchant Product Shortcode 169 1. WPMerchant Dropdown Menu 170 2. WPMerchant General Settings Page 171 3. WPMerchant Payment Settings Page. Connect your Stripe Account with One Click! 172 4. WPMerchant Email List Settings Page. Connect your MailChimp Account with One Click! 173 5. WPMerchant After Checkout Settings Page. Set the thank you page you want to redirect users to after purchase. 174 6. List of WPMerchant Products 175 7. WPMerchant Product (on hover). If you click on Edit, you will view the Product Data and Shortcodes. 176 8. WPMerchant Product General Data (visible on WPMerchant Product Edit Page) 177 9. WPMerchant Product Buy Button Shortcode (visible on WPMerchant Product Edit Page) 178 10.WPMerchant Product Buy Form Shortcode (visible on WPMerchant Product Edit Page) 179 11.WPMerchant Product Inventory Data (visible on WPMerchant Product Edit Page) 180 12.WPMerchant Product Email Data (visible on WPMerchant Product Edit Page) 181 13.List of WPMerchant Plans (for recurring billing). *IMPORTANT: Only available with the WPMerchant Professional version 182 14.WPMerchant Plan (on hover). If you click on Edit, you will view the Plan Data and Shortcodes. *IMPORTANT: Only available with the WPMerchant Professional version 183 15. WPMerchant Plan General Data (visible on WPMerchant Plan Edit Page). *IMPORTANT: Only available with the WPMerchant Professional version 184 16. WPMerchant Plan Inventory Data (visible on WPMerchant Plan Edit Page). *IMPORTANT: Only available with the WPMerchant Professional version 185 17. WPMerchant Plan Email Data (visible on WPMerchant Plan Edit Page). *IMPORTANT: Only available with the WPMerchant Professional version 186 18. WPMerchant Plan Pre/Post Data (visible on WPMerchant Plan Edit Page). *IMPORTANT: Only available with the WPMerchant Professional version 187 19. WPMerchant Plan Subscribe Button Shortcode (visible on WPMerchant Plan Edit Page). *IMPORTANT: Only available with the WPMerchant Professional version 188 20. WPMerchant Plan Subscribe Form Shortcode (visible on WPMerchant Plan Edit Page). *IMPORTANT: Only available with the WPMerchant Professional version 189 21. WPMerchant Payment Form Example. *IMPORTANT: Only available with the WPMerchant Professional version 190 22. WPMerchant Payment Button Example. 191 23. This is what appears after clicking on the WPMerchant Payment Button 176 192 177 193 == Changelog == 194 = 2.0.1 = 195 * Debug issue instantiating WPMerchant Admin Class 178 196 179 197 = 2.0 = -
wpmerchant/trunk/admin/class-wpmerchant-admin.php
r1688170 r1697860 202 202 function wpmerchant_products_columns($columns) { 203 203 // Remove Author and Comments from Columns and Add Cost, Inventory and Product Id 204 return array( 204 unset( 205 $columns['wpseo-score'], 206 $columns['wpseo-title'], 207 $columns['wpseo-metadesc'], 208 $columns['wpseo-focuskw'] 209 ); 210 return array( 205 211 'cb' => '<input type="checkbox" />', 206 212 'title' => __('Name'), -
wpmerchant/trunk/includes/class-wpmerchant.php
r1688173 r1697860 8 8 * 9 9 * @link wpmerchant.com/team 10 * @since 2.0.010 * @since 1.0.0 11 11 * 12 12 * @package Wpmerchant … … 23 23 * version of the plugin. 24 24 * 25 * @since 2.0.025 * @since 1.0.0 26 26 * @package Wpmerchant 27 27 * @subpackage Wpmerchant/includes … … 70 70 71 71 $this->plugin_name = 'wpmerchant'; 72 $this->version = '2.0. 0';72 $this->version = '2.0.1'; 73 73 74 74 $this->load_dependencies(); -
wpmerchant/trunk/public/class-wpmerchant-public.php
r1688170 r1697860 152 152 } 153 153 $currency1 = get_option( $this->plugin_name.'_currency' ); 154 $Wpmerchant_Admin = new Wpmerchant_Admin( );154 $Wpmerchant_Admin = new Wpmerchant_Admin($this->plugin_name, $this->version); 155 155 $currency2 = $Wpmerchant_Admin->get_currency_details($currency1); 156 156 $currency = $currency2['value']; … … 902 902 return $company_name; 903 903 } 904 /** 905 * Change login logo from wordpress to company logo 906 * 907 * @since 1.0.0 908 */ 909 public function wpmerchant_login_page() { 910 /*background-image: url(<?php echo get_stylesheet_directory_uri(); ?>/images/site-login-logo.png);*/ 911 $logo = get_option('wpmerchant_login_logo'); 912 $primary_bg_color = get_option('wpmerchant_login_primary_color'); 913 //'#ffc200'; 914 $primary_text_color = get_option('wpmerchant_login_btn_text_color'); 915 916 //'#fff'; 917 ?><style type="text/css"> 918 <?php if($logo): ?> 919 .login h1 a { 920 background-image: url(<?= $logo ?>); 921 padding-bottom: 30px; 922 } 923 <?php endif; ?> 924 <?php if($primary_bg_color): ?> 925 body.login div#login form#loginform p.submit input#wp-submit { 926 background-color: <?= $primary_bg_color ?>; 927 border: 0px; 928 box-shadow: none; 929 } 930 body.login div#login p#backtoblog a:hover { 931 color:<?= $primary_bg_color ?>; 932 } 933 body.login div#login p#nav a:hover { 934 color:<?= $primary_bg_color ?>; 935 } 936 body.login .message { 937 border-left: 4px solid <?= $primary_bg_color ?>; 938 } 939 form#loginform input:focus { 940 border: 1px solid <?= $primary_bg_color ?>; 941 box-shadow: none; 942 webkit-box-shadow: none; 943 /*box-shadow: <?= $primary_bg_color ?> 0px 0px 1px .7px;*/ 944 } 945 <?php endif; ?> 946 <?php if($primary_text_color): ?> 947 body.login div#login form#loginform p.submit input#wp-submit { 948 color: <?= $primary_text_color ?>; 949 } 950 <?php endif; ?> 951 </style><?php 952 } 904 953 905 /** 954 906 * Ajax Function Run following product purchase … … 1063 1015 //use the currency that is included with the form and if unincluded use the default currency 1064 1016 $currency1 = get_option( $this->plugin_name.'_currency' ); 1065 $Wpmerchant_Admin = new Wpmerchant_Admin( );1017 $Wpmerchant_Admin = new Wpmerchant_Admin($this->plugin_name, $this->version); 1066 1018 $currency2 = $Wpmerchant_Admin->get_currency_details($currency1); 1067 1019 $currency = strtolower($currency2['value']); … … 1694 1646 1695 1647 } 1648 /** 1649 * Change login logo from wordpress to company logo 1650 * 1651 * @since 1.0.0 1652 */ 1653 public function wpmerchant_login_page() { 1654 /*background-image: url(<?php echo get_stylesheet_directory_uri(); ?>/images/site-login-logo.png);*/ 1655 $logo = get_option('wpmerchant_login_logo'); 1656 $primary_bg_color = get_option('wpmerchant_login_primary_color'); 1657 //'#ffc200'; 1658 $primary_text_color = get_option('wpmerchant_login_btn_text_color'); 1659 1660 //'#fff'; 1661 ?><style type="text/css"> 1662 <?php if($logo): ?> 1663 .login h1 a { 1664 background-image: url(<?= $logo ?>); 1665 padding-bottom: 30px; 1666 } 1667 <?php endif; ?> 1668 <?php if($primary_bg_color): ?> 1669 body.login div#login form#loginform p.submit input#wp-submit { 1670 background-color: <?= $primary_bg_color ?>; 1671 border: 0px; 1672 box-shadow: none; 1673 } 1674 body.login div#login p#backtoblog a:hover { 1675 color:<?= $primary_bg_color ?>; 1676 } 1677 body.login div#login p#nav a:hover { 1678 color:<?= $primary_bg_color ?>; 1679 } 1680 body.login .message { 1681 border-left: 4px solid <?= $primary_bg_color ?>; 1682 } 1683 form#loginform input:focus { 1684 border: 1px solid <?= $primary_bg_color ?>; 1685 box-shadow: none; 1686 webkit-box-shadow: none; 1687 /*box-shadow: <?= $primary_bg_color ?> 0px 0px 1px .7px;*/ 1688 } 1689 <?php endif; ?> 1690 <?php if($primary_text_color): ?> 1691 body.login div#login form#loginform p.submit input#wp-submit { 1692 color: <?= $primary_text_color ?>; 1693 } 1694 <?php endif; ?> 1695 </style><?php 1696 } 1696 1697 } -
wpmerchant/trunk/wpmerchant.php
r1688173 r1697860 10 10 * 11 11 * @link wpmerchant.com/team 12 * @since 2.0.012 * @since 1.0.0 13 13 * @package Wpmerchant 14 14 * … … 17 17 * Plugin URI: wpmerchant.com 18 18 * Description: Start making money by easily and professionally selling anything on your website. 19 * Version: 2.0. 019 * Version: 2.0.1 20 20 * Author: WPMerchant 21 * Author URI: wpmerchant.com/ team21 * Author URI: wpmerchant.com/pricing 22 22 * Text Domain: wpmerchant 23 23 * Domain Path: /languages
Note: See TracChangeset
for help on using the changeset viewer.