Changeset 2846187

Timestamp:

01/10/2023 01:57:39 PM (19 months ago)

Author:

khorshidlab

Message:

Plugin Version 1.0.6

Location:

podro-wp

Files:

• tags/1.0.6 (copied) (copied from podro-wp/trunk)
• tags/1.0.6/README.txt (modified) (2 diffs)
• tags/1.0.6/admin/Enqueue.php (modified) (1 diff)
• tags/1.0.6/admin/views/pages/api-key-settings.php (modified) (5 diffs)
• tags/1.0.6/assets/css/admin.css (modified) (1 diff)
• tags/1.0.6/assets/js/cities.js (modified) (2 diffs)
• tags/1.0.6/assets/js/only-podro-cities.js (added)
• tags/1.0.6/inc/Api_Key.php (modified) (2 diffs)
• tags/1.0.6/inc/Helper.php (added)
• tags/1.0.6/inc/MetaBox.php (modified) (4 diffs)
• tags/1.0.6/inc/Podro_Order_Table.php (modified) (1 diff)
• tags/1.0.6/inc/Setup.php (modified) (4 diffs)
• tags/1.0.6/inc/WooSetting.php (modified) (8 diffs)
• tags/1.0.6/vendor/autoload.php (modified) (1 diff)
• tags/1.0.6/vendor/composer/autoload_classmap.php (modified) (1 diff)
• tags/1.0.6/vendor/composer/autoload_real.php (modified) (2 diffs)
• tags/1.0.6/vendor/composer/autoload_static.php (modified) (3 diffs)
• tags/1.0.6/vendor/composer/installed.php (modified) (2 diffs)
• tags/1.0.6/wp-podro.php (modified) (2 diffs)
• trunk/README.txt (modified) (2 diffs)
• trunk/admin/Enqueue.php (modified) (1 diff)
• trunk/admin/views/pages/api-key-settings.php (modified) (5 diffs)
• trunk/assets/css/admin.css (modified) (1 diff)
• trunk/assets/js/cities.js (modified) (2 diffs)
• trunk/assets/js/only-podro-cities.js (added)
• trunk/inc/Api_Key.php (modified) (2 diffs)
• trunk/inc/Helper.php (added)
• trunk/inc/MetaBox.php (modified) (4 diffs)
• trunk/inc/Podro_Order_Table.php (modified) (1 diff)
• trunk/inc/Setup.php (modified) (4 diffs)
• trunk/inc/WooSetting.php (modified) (8 diffs)
• trunk/vendor/autoload.php (modified) (1 diff)
• trunk/vendor/composer/autoload_classmap.php (modified) (1 diff)
• trunk/vendor/composer/autoload_real.php (modified) (2 diffs)
• trunk/vendor/composer/autoload_static.php (modified) (3 diffs)
• trunk/vendor/composer/installed.php (modified) (2 diffs)
• trunk/wp-podro.php (modified) (2 diffs)

podro-wp/tags/1.0.6/README.txt

@@ -5 +5 @@
 Tested up to: 6.1
 Requires PHP: 7.2
-Stable tag: 1.0.5
+Stable tag: 1.0.
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -59 +59 @@
 == Changelog ==
 
+
+
+
+
+
 = 1.0.5 - 2022-12-25 =
 * Fix the cities js conflict in checkout page

podro-wp/tags/1.0.6/admin/Enqueue.php

@@ -76 +76 @@
 
         if ( is_cart() || is_checkout() || is_wc_endpoint_url( 'edit-address' ) ) {
-            $city_select_path = PODRO_PLUGIN_ROOT_URL . 'assets/js/cities.js';
+
+            if ( function_exists( 'PWS' ) || class_exists('PWS_Core') || in_array( 'persian-woocommerce-shipping/woocommerce-shipping.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) ) {
+                $city_select_path = PODRO_PLUGIN_ROOT_URL . 'assets/js/cities.js';
+            }else{
+                $city_select_path = PODRO_PLUGIN_ROOT_URL . 'assets/js/only-podro-cities.js';
+            }
+
+
+
             wp_enqueue_script(
                 'wc-city-select',

podro-wp/tags/1.0.6/admin/views/pages/api-key-settings.php

@@ -2 +2 @@
 $credentials_status = get_option( 'podro_plugin_status' );
 $credentials = get_option( 'podro_plugin_credentials', true );
+
+
+
+
 
 ?>
@@ -13 +17 @@
             <h1><?php  esc_html_e( 'تنظیمات عمومی پادرو', 'podro-wp' ) ?></h1>
             <h3><?php  esc_html_e( 'پیکربندی اتصال به پادرو پین', 'podro-wp' ) ?></h3>
-            <form class="wp_podro-config-form" method="post" action="<?php echo esc_url(admin_url( '/admin.php?page=' . PODRO_SLUG )); ?>">
+            <form class="wp_podro-config-form" method="post" action="<?php echo esc_url(admin_url( '/admin.php?page=' . PODRO_SETTINGS_PAGE_SLUG )); ?>">
+
                 <div class="pdo-box">
                     <label for="pdo_email">ایمیل</label>
@@ -22 +27 @@
                     <input type="password" name="pdo_password" id="pdo_password" autocomplete="off">
                 </div>
+
+
+
+
+
                 <h3><?php  esc_html_e( 'تنظیمات فروشگاه', 'podro-wp' ) ?></h3>
+
+
+
+
                 <div class="pdo-box">
 
@@ -28 +42 @@
                     <?php
                     $provinces = \WP_PODRO\Engine\WooSetting::get_provinces();
-                    echo "<select aria-label='شهر' class='wc-enhanced-select' id='podro_store_location' name='podro_store_location' style='width:325px;' >";
+                    echo "<select aria-label='شهر' class='wc-enhanced-select' id='podro_store_' style='width:325px;' >";
                     foreach($provinces as $province){
                         echo "<optgroup label='".esc_attr($province['name'])."'>";
                         foreach ($province['cities'] as $key=>$city)
-                            if(get_option('woocommerce_store_city') == $key)
+                            if(get_option('_store_city') == $key)
                                 echo "<option selected value='". esc_attr($key)."'>".esc_attr($city)."</option>";
                             else
@@ -48 +62 @@
                 </div>
                 <div class="pdo-box">
-                    <a class="get-api-key" href="https://podro.com/plugin-pin/" target="_blank" rel="noopener noreferrer"><?php  esc_html_e('دریافت کلید API', 'podro-wp'); ?></a>
+                    <label for="pdo_address">آدرس</label>
+                    <textarea name="podro_store_address" id="podro_store_address" ><?php  echo esc_attr( $store_address ?? '' )  ?></textarea>
                 </div>
-                <button type="submit" class="button button-primary" name="config_podro_api_key" value="1"><?php  esc_html_e( "ذخیره", 'podro-wp' ) ?></button>
+                <button type="submit" class="button button-primary" name="config_podro_" value="1"><?php  esc_html_e( "ذخیره", 'podro-wp' ) ?></button>
             </form>
         </div>

podro-wp/tags/1.0.6/assets/css/admin.css

@@ -1 @@
-@font-face{font-family:IRANSansX;font-style:normal;font-weight:bold;src:url("../fonts/woff/IRANSansX-bold.woff") format("woff"),url("../fonts/woff2/IRANSansX-bold.woff2") format("woff2")}@font-face{font-family:IRANSansX;font-style:normal;font-weight:normal;src:url("../fonts/woff/IRANSansX-regular.woff") format("woff"),url("../fonts/woff2/IRANSansX-regular.woff2") format("woff2")}.pod-wrap,.toplevel_page_podro-wp,.pdo-wrapper,#woocommerce-order-podro,#woocommerce-order-podro h2,.pod-wrap h1,.pod-wrap h2,.pod-wrap h3{font-family:IRANSansX}#adminmenu #toplevel_page_podro-wp>a img{width:18px}.pod-footer{background-color:#883df2;border-radius:5px;padding:15px;display:flex;align-items:center;max-width:1202px;width:calc(100% - 30px);color:#fff}.pod-footer .pod-footer-links{width:70%;float:left}.pod-footer .pod-footer-links ul{width:100%}.pod-footer .pod-footer-links ul li{display:inline-block;margin-inline-end:15px;margin-bottom:0}.pod-footer .pod-footer-links ul li a{color:#fff;opacity:.7;text-decoration:none !important}.pod-footer .pod-footer-social{width:30%;float:right}.pod-footer .pod-footer-social .footer__social-icons{float:right;width:180px;text-align:left;direction:ltr;flex-direction:row;justify-content:space-between;display:flex}.pod-footer .pod-footer-social .footer__social-icons .footer__social-icons__link{display:block}.pod-footer .pod-footer-social .footer__social-icons .footer__social-icons__link svg{width:30px;height:30px}.pdo-wrapper{max-width:1232px;width:100%}.pdo-wrapper .pdo-card{max-width:1232px;width:calc(100% - 48px);background:#fff;background-color:#fff;box-shadow:0 2px 5px rgba(0,0,0,0.05);border-radius:5px;padding:24px;margin-bottom:20px}.pdo-box{width:390px;display:flex;align-items:center;justify-content:space-between;margin-bottom:12px}.pdo-box label{display:inline-block;height:22px;cursor:pointer;font-weight:bold}.pdo-box input{width:325px;text-align:left;direction:ltr}.pdo-box .get-api-key{display:block;width:100%;text-align:right;margin-top:10px;text-decoration:none !important}pre.xdebug-var-dump{margin-left:320px}.delivery_options{display:flex;margin-bottom:10px}.delivery_options .delivery_option{display:flex;align-items:center;flex-direction:column;padding:16px 12px;margin-bottom:10px;border:solid #bcbcbc 1px;border-radius:10px;margin-right:16px;width:136px}.delivery_options .delivery_option label{text-align:center}.delivery_options .delivery_option img{max-height:28px}ul.pod-delivery-step{display:flex;flex-direction:column;align-items:center;justify-content:center;margin-bottom:20px;margin-top:0}ul.pod-delivery-step li{display:flex;flex-direction:column;width:100%}ul.pod-delivery-step li.pod-dimension{background:#efefef;padding:10px;width:calc(100% - 20px);flex-wrap:wrap;flex-direction:row;margin-top:10px}ul.pod-delivery-step li.pod-dimension p{margin-top:0;width:100%}ul.pod-delivery-step li.pod-dimension>div{display:flex;flex-direction:column;width:33.33%}.pod-delivery-step-button{display:flex;align-items:center;justify-content:center;margin-top:10px;margin-bottom:10px;width:100%;max-width:100%;max-height:100%;cursor:pointer;background-color:#883df2;color:#fff;border:none;border-radius:5px;padding:10px;font-size:14px;font-weight:bold;text-decoration:none !important}.pod-delivery-cancel{display:flex;align-items:center;justify-content:center;margin-top:10px;margin-bottom:10px;width:100%;max-width:100%;max-height:100%;cursor:pointer;background-color:#b1b1b1;color:#fff;border:none;border-radius:5px;padding:10px;font-size:14px;font-weight:bold;text-decoration:none !important}.pod-delivery-step-2-wrapper{display:flex;flex-direction:column}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option{display:flex;flex-direction:row;flex-wrap:wrap;width:calc( 100% - 40px);align-items:center;margin-bottom:12px;border-radius:12px;background-color:#f3f3f3;padding:20px;border:solid 1px transparent;cursor:pointer}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option input{margin-left:10px}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option.active{border:solid 1px #893df2;box-shadow:0px 0px 11px -1px #893df24d}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option.active:checked::before{background-color:#883df2}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label .pod_delivery_option,.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label .pod_pickup_option{display:flex;align-items:center;flex-wrap:wrap}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label img{max-width:50px;max-height:40px;margin-left:4px}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label>p{flex:1 1 100%;margin:4px 0}.pod-pickup-step-3-option-wrapper,.pod-delivery-step-3-option-wrapper{display:flex;flex-wrap:wrap}.pod-pickup-step-3-option-wrapper .pod-pickup-step-3-option,.pod-pickup-step-3-option-wrapper .pod-delivery-step-3-option,.pod-delivery-step-3-option-wrapper .pod-pickup-step-3-option,.pod-delivery-step-3-option-wrapper .pod-delivery-step-3-option{padding:10px;margin-inline-end:10px;margin-bottom:10px;box-shadow:0px 0px 11px -1px #893df24d;border-radius:6px;cursor:pointer}.pod-pickup-step-3-option-wrapper .pod-pickup-step-3-option input,.pod-pickup-step-3-option-wrapper .pod-delivery-step-3-option input,.pod-delivery-step-3-option-wrapper .pod-pickup-step-3-option input,.pod-delivery-step-3-option-wrapper .pod-delivery-step-3-option input{display:none}.pod-pickup-step-3-option-wrapper .pod-pickup-step-3-option.active,.pod-pickup-step-3-option-wrapper .pod-delivery-step-3-option.active,.pod-delivery-step-3-option-wrapper .pod-pickup-step-3-option.active,.pod-delivery-step-3-option-wrapper .pod-delivery-step-3-option.active{border:solid 1px #893df2;box-shadow:0px 0px 11px -1px #893df24d}.pod-hide{display:none}.pod-show{display:block}.pod-flex{display:flex}.rtl .delivery_options .delivery_option label{margin:0 0 0 16px}select[name="pod_delivery_option_day"]{display:block;width:100%;margin-bottom:20px}#woocommerce-order-podro .inside{padding-top:12px}#woocommerce-order-podro #loading-circle{display:none;position:absolute;top:0;bottom:0;left:0;right:0;margin:auto;width:50px;height:50px;border:8px solid #f3f3f3;border-top:8px solid #893df2;border-radius:50%;animation:spin 0.6s ease-in infinite}#woocommerce-order-podro #lock-modal{display:none;background-color:#06282e9e;opacity:1;position:absolute;top:-6px;left:0;right:0;bottom:0}#woocommerce-order-podro h3,#woocommerce-order-podro h4{margin-top:0}input.pod-error,select.pod-error{border:solid 1px #ff0000}.pod_order_details{width:100%}.pod_order_details tbody tr td{padding:10px;background-color:#efefef}.pod_order_details tbody tr th{padding:2px 10px;background-color:#caa3ff}.pdo-about{font-size:18px}.rtl .pod-footer .pod-footer-social{float:left}.rtl .pod-footer .pod-footer-social .footer__social-icons{float:left}#get_order_pdf,.get_order_pdf,#pod-cancel-order,.pod-cancel-order{cursor:pointer}
+@font-face{font-family:IRANSansX;font-style:normal;font-weight:bold;src:url("../fonts/woff/IRANSansX-bold.woff") format("woff"),url("../fonts/woff2/IRANSansX-bold.woff2") format("woff2")}@font-face{font-family:IRANSansX;font-style:normal;font-weight:normal;src:url("../fonts/woff/IRANSansX-regular.woff") format("woff"),url("../fonts/woff2/IRANSansX-regular.woff2") format("woff2")}.pod-wrap,.toplevel_page_podro-wp,.pdo-wrapper,#woocommerce-order-podro,#woocommerce-order-podro h2,.pod-wrap h1,.pod-wrap h2,.pod-wrap h3{font-family:IRANSansX}#adminmenu #toplevel_page_podro-wp>a img{width:18px}.pod-footer{background-color:#883df2;border-radius:5px;padding:15px;display:flex;align-items:center;max-width:1202px;width:calc(100% - 30px);color:#fff}.pod-footer .pod-footer-links{width:70%;float:left}.pod-footer .pod-footer-links ul{width:100%}.pod-footer .pod-footer-links ul li{display:inline-block;margin-inline-end:15px;margin-bottom:0}.pod-footer .pod-footer-links ul li a{color:#fff;opacity:.7;text-decoration:none !important}.pod-footer .pod-footer-social{width:30%;float:right}.pod-footer .pod-footer-social .footer__social-icons{float:right;width:180px;text-align:left;direction:ltr;flex-direction:row;justify-content:space-between;display:flex}.pod-footer .pod-footer-social .footer__social-icons .footer__social-icons__link{display:block}.pod-footer .pod-footer-social .footer__social-icons .footer__social-icons__link svg{width:30px;height:30px}.pdo-wrapper{max-width:1232px;width:100%}.pdo-wrapper .pdo-card{max-width:1232px;width:calc(100% - 48px);background:#fff;background-color:#fff;box-shadow:0 2px 5px rgba(0,0,0,0.05);border-radius:5px;padding:24px;margin-bottom:20px}.pdo-box{width:390px;display:flex;align-items:center;justify-content:space-between;margin-bottom:12px}.pdo-box label{display:inline-block;height:22px;cursor:pointer;font-weight:bold}.pdo-box input{width:325px;text-align:left;direction:ltr}.pdo-box .get-api-key{display:block;width:100%;text-align:right;margin-top:10px;text-decoration:none !important}pre.xdebug-var-dump{margin-left:320px}.delivery_options{display:flex;margin-bottom:10px}.delivery_options .delivery_option{display:flex;align-items:center;flex-direction:column;padding:16px 12px;margin-bottom:10px;border:solid #bcbcbc 1px;border-radius:10px;margin-right:16px;width:136px}.delivery_options .delivery_option label{text-align:center}.delivery_options .delivery_option img{max-height:28px}ul.pod-delivery-step{display:flex;flex-direction:column;align-items:center;justify-content:center;margin-bottom:20px;margin-top:0}ul.pod-delivery-step li{display:flex;flex-direction:column;width:100%}ul.pod-delivery-step li.pod-dimension{background:#efefef;padding:10px;width:calc(100% - 20px);flex-wrap:wrap;flex-direction:row;margin-top:10px}ul.pod-delivery-step li.pod-dimension p{margin-top:0;width:100%}ul.pod-delivery-step li.pod-dimension>div{display:flex;flex-direction:column;width:33.33%}.pod-delivery-step-button{display:flex;align-items:center;justify-content:center;margin-top:10px;margin-bottom:10px;width:100%;max-width:100%;max-height:100%;cursor:pointer;background-color:#883df2;color:#fff;border:none;border-radius:5px;padding:10px;font-size:14px;font-weight:bold;text-decoration:none !important}.pod-delivery-cancel{display:flex;align-items:center;justify-content:center;margin-top:10px;margin-bottom:10px;width:100%;max-width:100%;max-height:100%;cursor:pointer;background-color:#b1b1b1;color:#fff;border:none;border-radius:5px;padding:10px;font-size:14px;font-weight:bold;text-decoration:none !important}.pod-delivery-step-2-wrapper{display:flex;flex-direction:column}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option{display:flex;flex-direction:row;flex-wrap:wrap;width:calc( 100% - 40px);align-items:center;margin-bottom:12px;border-radius:12px;background-color:#f3f3f3;padding:20px;border:solid 1px transparent;cursor:pointer}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option input{margin-left:10px}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option.active{border:solid 1px #893df2;box-shadow:0px 0px 11px -1px #893df24d}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option.active:checked::before{background-color:#883df2}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label .pod_delivery_option,.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label .pod_pickup_option{display:flex;align-items:center;flex-wrap:wrap}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label img{max-width:50px;max-height:40px;margin-left:4px}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label>p{flex:1 1 100%;margin:4px 0}.pod-pickup-step-3-option-wrapper,.pod-delivery-step-3-option-wrapper{display:flex;flex-wrap:wrap}.pod-pickup-step-3-option-wrapper .pod-pickup-step-3-option,.pod-pickup-step-3-option-wrapper .pod-delivery-step-3-option,.pod-delivery-step-3-option-wrapper .pod-pickup-step-3-option,.pod-delivery-step-3-option-wrapper .pod-delivery-step-3-option{padding:10px;margin-inline-end:10px;margin-bottom:10px;box-shadow:0px 0px 11px -1px #893df24d;border-radius:6px;cursor:pointer}.pod-pickup-step-3-option-wrapper .pod-pickup-step-3-option input,.pod-pickup-step-3-option-wrapper .pod-delivery-step-3-option input,.pod-delivery-step-3-option-wrapper .pod-pickup-step-3-option input,.pod-delivery-step-3-option-wrapper .pod-delivery-step-3-option input{display:none}.pod-pickup-step-3-option-wrapper .pod-pickup-step-3-option.active,.pod-pickup-step-3-option-wrapper .pod-delivery-step-3-option.active,.pod-delivery-step-3-option-wrapper .pod-pickup-step-3-option.active,.pod-delivery-step-3-option-wrapper .pod-delivery-step-3-option.active{border:solid 1px #893df2;box-shadow:0px 0px 11px -1px #893df24d}.pod-hide{display:none}.pod-show{display:block}.pod-flex{display:flex}.rtl .delivery_options .delivery_option label{margin:0 0 0 16px}select[name="pod_delivery_option_day"]{display:block;width:100%;margin-bottom:20px}#woocommerce-order-podro .inside{padding-top:12px}#woocommerce-order-podro #loading-circle{display:none;position:absolute;top:0;bottom:0;left:0;right:0;margin:auto;width:50px;height:50px;border:8px solid #f3f3f3;border-top:8px solid #893df2;border-radius:50%;animation:spin 0.6s ease-in infinite}#woocommerce-order-podro #lock-modal{display:none;background-color:#06282e9e;opacity:1;position:absolute;top:-6px;left:0;right:0;bottom:0}#woocommerce-order-podro h3,#woocommerce-order-podro h4{margin-top:0}input.pod-error,select.pod-error{border:solid 1px #ff0000}.pod_order_details{width:100%}.pod_order_details tbody tr td{padding:10px;background-color:#efefef}.pod_order_details tbody tr th{padding:2px 10px;background-color:#caa3ff}.pdo-about{font-size:18px}.rtl .pod-footer .pod-footer-social{float:left}.rtl .pod-footer .pod-footer-social .footer__social-icons{float:left}#get_order_pdf,.get_order_pdf,#pod-cancel-order,.pod-cancel-order{cursor:pointer}

podro-wp/tags/1.0.6/assets/js/cities.js

@@ -1 +1 @@
 jQuery(document).ready(function(){
 
-    jQuery('body').on('country_to_state_changed', function(p1,country){
 
-        if( 'IR' == country ){
-            //
-            jQuery('input#billing_city').replaceWith('<select id="billing_city" name="billing_city"></select>');
-            jQuery('input#shipping_city').replaceWith('<select id="shipping_city" name="shipping_city"></select>');
-            jQuery('select#billing_city').selectWoo();
-            jQuery('select#shipping_city').selectWoo();
-            getCities();
+    const data = {
+        action:'get_podro_cities',
+        method:'post'
+    }
+    ajaxRequest(data, podro_cities_callback, null);
+    let cities = [];
+    function podro_cities_callback(response, element){
+        cities = response;
+
+    }
+
+    jQuery('#billing_city').on('change', function(){
+
+        if( !is_this_podro_city(cities,jQuery(this).find('option:selected').text())){
+            jQuery("[id*='podro_method']").prop('disabled', true);
+            jQuery("[id*='podro_method']").prop('checked',false);
+            jQuery("[id*='podro_method']").removeAttr('checked');
+            const count = jQuery(this).find('#shipping_method input[type=radio]:checked').length;
+            if(count > 0)
+                return;
+            if(!jQuery('#shipping_method input[type=radio]:checked').attr('id'))
+                jQuery("[id*='podro_method']").parent().next('li').find("input[type=radio]").prop('checked',true);
         }else{
-            jQuery('#billing_city').parent().find('.select2').remove();
-            jQuery('#shipping_city').parent().find('.select2').remove();
-            jQuery('#billing_city').replaceWith('<input type="text" name="billing_city" id="billing_city" class="input-text "/>');
-            jQuery('#shipping_city').replaceWith('<input type="text" name="shipping_city" id="shipping_city" class="input-text "/>');
+            jQuery("[id*='podro_method']").prop('disabled',false);
+
         }
     });
 
-    function getCities(){
-        jQuery('#billing_state, body').change(function(){
-            const province_code = jQuery(this).val();
-            const element = jQuery('#billing_city');
-            if(!province_code)
+    jQuery('body').on('updated_checkout', function() {
+        if( !is_this_podro_city(cities,jQuery('#billing_city').find('option:selected').text())){
+
+            jQuery("[id*='podro_method']").prop('disabled', true);
+            jQuery("[id*='podro_method']").prop('checked',false);
+            jQuery("[id*='podro_method']").removeAttr('checked');
+            const count = jQuery(this).find('#shipping_method input[type=radio]:checked').length;
+            if(count > 0)
                 return;
-            const data = {
-                action:'get_podro_cities_by_province',
-                //security: wp_podro_ajax_object.security,
-                province: province_code
-            };
 
-            ajaxRequest(data, callbackGetCities, element);
+
+            if(!jQuery('#shipping_method input[type=radio]:checked').attr('id'))
+                jQuery("[id*='podro_method']").parent().next('li').find("input[type=radio]").prop('checked',true);
+        }else{
+            jQuery("[id*='podro_method']").prop('disabled',false);
+
+
+        }
+    });
+
+
+    function is_this_podro_city(city_list, name){
+
+        let result = false;
+        Object.keys(city_list).forEach(key => {
+
+            if(  city_list[key] === name ){
+                result = true;
+                return result;
+            }
+
 
         });
+
+
 
-        jQuery('#shipping_state, body').change(function(){
-            const province_code = jQuery(this).val();
-            const element = jQuery('#shipping_city');
-            if(!province_code)
-                return;
-            const data = {
-                action:'get_podro_cities_by_province',
-                //security: wp_podro_ajax_object.security,
-                province: province_code
-            };
-
-            ajaxRequest(data, callbackGetCities, element);
-        });
-
-    }
 
     function callbackGetCities(response, element){
@@ -59 +76 @@
 
         Object.keys(cities).forEach(function(key) {
-            console.log('Key : ' + key + ', Value : ' + cities[key])
+
             element.append(`<option value='${key}'>${cities[key]}</option>`);
 

podro-wp/tags/1.0.6/inc/Api_Key.php

@@ -77 +77 @@
     public static function set_pdo_api_key() {
 
-        if( ! isset( $_POST[ 'config_podro_api_key' ] ) ) {
-            return;
-        }
-        update_option('woocommerce_store_city', sanitize_text_field($_POST['podro_store_location']));
-        $pdo_email = sanitize_email( $_POST[ 'pdo_email' ] );
-        $pdo_password = sanitize_text_field( $_POST[ 'pdo_password' ] );
-        if ( $pdo_email == null || $pdo_password == null || ( ! empty( $pdo_email ) && !empty( $pdo_password ) && $pdo_password === "**************" ) ) {
-            add_action( 'admin_notices', function () {
-                echo wp_kses_post('<div class="notice notice-error is-dismissible">
+
+
+        if(  isset( $_POST[ 'config_podro_api_key' ] ) ) {
+            $pdo_email = sanitize_email( $_POST[ 'pdo_email' ] );
+            $pdo_password = sanitize_text_field( $_POST[ 'pdo_password' ] );
+            if ( $pdo_email == null || $pdo_password == null || ( ! empty( $pdo_email ) && !empty( $pdo_password ) && $pdo_password === "**************" ) ) {
+                add_action( 'admin_notices', function () {
+                    echo wp_kses_post('<div class="notice notice-error is-dismissible">
                         <p>'. esc_html__( "لطفا موارد موردنیاز را وارد کنید.", 'podro-wp' ) .'</p>
+
                     </div>');
-            } );
-            return false;
-        }
+            } );
+            return false;
+        }
 
-        if ( !$token = self::validate_api_key( $pdo_email, (new Encryption)->encrypt($pdo_password) ) ) {
-            return false;
-        }
+        if ( !$token = self::validate_api_key( $pdo_email, (new Encryption)->encrypt($pdo_password) ) ) {
+            return false;
+        }
 
-        $save_settings = update_option( 'podro_api_key', (new Encryption)->encrypt($token) );
+        $save_settings = update_option( 'podro_api_key', (new Encryption)->encrypt($token) );
 
-        if( $save_settings ) {
-            update_option( 'podro_plugin_status', 'connected');
-            update_option( 'podro_plugin_credentials', [
-                'email' => $pdo_email,
-                'password' => (new Encryption)->encrypt($pdo_password),
-            ]);
+        if( $save_settings ) {
+            update_option( 'podro_plugin_status', 'connected');
+            update_option( 'podro_plugin_credentials', [
+                'email' => $pdo_email,
+                'password' => (new Encryption)->encrypt($pdo_password),
+            ]);
 
-            wp_redirect( home_url( '/wp-admin/admin.php?page=' . PODRO_SLUG ) );
+                wp_redirect( home_url( '/wp-admin/admin.php?page=' . PODRO_SETTINGS_PAGE_SLUG ) );
+
+                add_action( 'admin_notices', function () {
+                    echo wp_kses_post('<div class="notice notice-success is-dismissible">
+                        <p>'. esc_html__( "تنظیمات ذخیره شد.", 'wp-podro' ) .'</p>
+                    </div>');
+                } );
+            }
+        }else if( isset($_POST['config_podro_store_info']) ){
+
+            if( empty($_POST['podro_store_name']) || empty($_POST['podro_store_address']) ){
+                add_action( 'admin_notices', function () {
+                    echo wp_kses_post('<div class="notice notice-error is-dismissible">
+                        <p>'. esc_html__( "نام فروشگاه، شهرو آدرس نمی تواند خالی باشد", 'wp-podro' ) .'</p>
+                    </div>');
+                } );
+                return false;
+            }
+
+            update_option('podro_store_name', sanitize_text_field($_POST['podro_store_name']??''));
+            update_option('podro_store_city', sanitize_text_field($_POST['podro_store_city']??''));
+            update_option('podro_store_address', sanitize_text_field($_POST['podro_store_address']??''));
+
 
             add_action( 'admin_notices', function () {
@@ -111 +133 @@
                         <p>'. esc_html__( "تنظیمات ذخیره شد.", 'podro-wp' ) .'</p>
                     </div>');
-            } );
+            });
         }
+
 
     }

podro-wp/tags/1.0.6/inc/MetaBox.php

@@ -136 +136 @@
         $woo_setting = WooSetting::get_instance();
 
-        $source_city = $woo_setting->get_store_city_code_from_options();
+
         $order_id = $order->get_id();
         $destination_city_code = $order->get_shipping_city();
+
+
+
+
+
+
+
+
 
         $destination_city_name = (WooSetting::get_instance())->get_cities()[$destination_city_code];
@@ -144 +152 @@
         if( mb_strlen($destination_address) > $this->address_length )
             $destination_address = mb_substr($destination_address, 0, $this->address_length);
-        $store_address = $woo_setting->get_store_city() . ' ' . get_option( 'woocommerce_store_address' ) . get_option( 'woocommerce_store_address_2' );
+
+
+        $pod_source_city_code = $woo_setting->get_store_city_code_from_options();
+        $pod_store_address =  mb_substr($woo_setting->get_store_city() . ' ' . $woo_setting->get_store_address() , 0 , $this->address_length) ;
+        $pod_store_name =  mb_substr( $woo_setting->get_store_name(), 0, $this->store_name_length );
 
         $total_weight = 0;
@@ -183 +195 @@
         $user_billing_family = $order->get_billing_last_name();
 
-        $store_name = $this->get_store_name();
+
         $customer_note = $order->get_customer_note();
 
-        $option_pod_source_city = get_option('pod_source_city',false);
-        $option_pod_store_name = get_option('pod_store_name',false);
-
-        $option_pod_source_city = ( false == $option_pod_source_city ) ? $store_address : $option_pod_source_city;
-        $option_pod_store_name = ( false == $option_pod_store_name ) ?  $store_name : $option_pod_store_name;
+
+
 
 
@@ -198 +207 @@
             <li>
                 <label for="pod_store_name">نام فروشگاه</label>
-                <input type="text" name="pod_store_name" id="pod_store_name" maxlength="60" value="<?php echo esc_attr($option_pod_store_name); ?>"  />
+                <input type="text" name="pod_store_name" id="pod_store_name" maxlength="60" value="<?php echo esc_attr($pod_store_name); ?>"  />
             </li>
             <li>
                 <label for="pod_source_city">مبدا</label>
-                <textarea name="pod_source_city" id="pod_source_city" rows="6"><?php echo esc_attr($option_pod_source_city); ?></textarea>
-                <?php if (empty($store_address)) echo '<p style="color:red">'. esc_html__('لطفا آدرس فروشگاه را از تنظیمات ووکامرس وارد کنید.', 'podro-wp') .'</p>' ; ?>
-                <input type="hidden" id="pod_source_city_code" name="pod_source_city_code" value="<?php echo esc_attr($source_city); ?>">
+                <textarea name="pod_source_city" id="pod_source_city" rows="6"><?php echo esc_attr($); ?></textarea>
+                <?php if (empty($store_address)) echo '<p style="color:red">'. esc_html__('لطفا آدرس فروشگاه را از تنظیمات ووکامرس وارد کنید.', 'podro-wp') .'</p>' ; ?>
+                <input type="hidden" id="pod_source_city_code" name="pod_source_city_code" value="<?php echo esc_attr($); ?>">
             </li>
             <li>

podro-wp/tags/1.0.6/inc/Podro_Order_Table.php

@@ -105 +105 @@
         foreach ($orders as $order){
 
-            if ( $order['status'] == 'لغو شده') {
-                $cancel_order = 'از پیش لغو شده';
+            if ( $order['status'] == 'درحال پردازش' ||
+                $order['status'] == 'ثبت اولیه' ||
+                $order['status'] == 'در حال بررسی تاخیر' ) {
+                $cancel_order = '<a class="pod-cancel-order" data-order_id="' . $order['id'] . '">لغو ارسال</a>';
             } else {
-                $cancel_order = '<a class="pod-cancel-order" data-order_id="' . $order['id'] . '">لغو ارسال</a>';
+                $cancel_order = ;
             }
 

podro-wp/tags/1.0.6/inc/Setup.php

@@ -17 +17 @@
  * @link      https://github.com/KhorshidLab/WP-Podro
  */
+
+
 use WP_PODRO\Admin\Enqueue;
 use WP_PODRO\Engine\API\V1\Payments;
+
 
 class Setup {
@@ -85 +88 @@
      * @access   private
      */
+
+
+
+
+
+
+
+
+
     private function load_dependencies() {
 
@@ -91 +103 @@
         $this->loader = new Loader();
 
-        add_action('woocommerce_loaded', function(){
-
-
-        // Disable Persian Woocommerce City Select
-        if ( function_exists( 'PW' ) && PW()->get_options( 'enable_iran_cities' ) != 'no' ) {
-            $settings                       = PW()->get_options();
-            $settings['enable_iran_cities'] = 'no';
-            update_option( 'PW_Options', $settings );
-        }
-
-        // Disable Persian Woocommerce shipping City Select
-        if ( function_exists( 'PWS' ) || class_exists('PWS_Core') || in_array( 'persian-woocommerce-shipping/woocommerce-shipping.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) ) {
-
-            $pws = \PWS_Core::instance();
-
-
-            // Filters
-            remove_filter( 'woocommerce_states', [ $pws, 'iran_states' ], 20, 1 );
-            remove_filter( 'woocommerce_checkout_process', [ $pws, 'checkout_process' ], 20, 1 );
-
-
-            add_action( 'wp_enqueue_scripts', function() {
-                wp_dequeue_script( 'pwsCheckout' );
-            }, 999999 );
-
-
-
-}
-
-        }, 21);
-
-        if ( class_exists('WC_City_Select') ) {
-
-            $WC_City_Select = new WC_City_Select;
-
-            $this->loader->add_filter( 'woocommerce_billing_fields', $WC_City_Select, 'billing_fields', 999999, 2 );
-            $this->loader->add_filter( 'woocommerce_shipping_fields', $WC_City_Select, 'shipping_fields', 999999, 2 );
-            $this->loader->add_filter( 'woocommerce_form_field_city', $WC_City_Select, 'form_field_city', 999999, 4 );
-
-        }
+
+
+        add_action( 'wp_ajax_nopriv_get_podro_cities', [$this, 'podro_get_cities'] );
+        add_action( 'wp_ajax_get_podro_cities', [$this, 'podro_get_cities'] );
+
+
 
         $this->loader->add_action( 'admin_init', $Api_Key, 'set_pdo_api_key' );
@@ -269 +247 @@
                 __( 'تنظیمات', 'podro-wp' ),
                 'manage_options',
-                PODRO_SLUG . '-settings',
+                PODRO_S,
                 [$this, 'settings_page'],
             );

podro-wp/tags/1.0.6/inc/WooSetting.php

@@ -356 +356 @@
             '0006'=>'ساوه',
             '0005'=>'دلیجان',
-            '0101'=>'آستارا',
-            '0103'=>'بندرانزلی',
+            '0101'=>'آستارا',
+            '0103'=>'بندرانزلی',
             '0105'=>'رشت',
             '0111'=>'لاهیجان',
@@ -367 +367 @@
             '0206'=>'رامسر',
             '0207'=>'ساری',
-            '0210'=>'قائم شهر',
+            '0210'=>'قائمشهر',
             '0214'=>'نور',
             '0215'=>'نوشهر',
@@ -392 +392 @@
             '0808'=>'کرمان',
             '0908'=>'سبزوار',
-            '0916'=>'مشهد',
+            '0916'=>'مشهد',
             '0917'=>'نیشابور',
             '1002'=>'اصفهان',
             '1009'=>'شهرضا',
             '1010'=>'کاشان',
-            '1018'=>'آران وبیدگل',
+            '1018'=>'آران وبیدگل',
             '1102'=>'چابهار',
             '1105'=>'زاهدان',
@@ -405 +405 @@
             '1401'=>'بروجن',
             '1402'=>'شهرکرد',
-            '1503'=>'خرم آباد',
+            '1503'=>'خرمآباد',
             '1601'=>'ایلام',
             '1703'=>'گچساران',
-            '1801'=>'بوشهر',
+            '1801'=>'بوشهر',
             '1810'=>'عسلویه',
             '1901'=>'ابهر',
@@ -419 +419 @@
             '2105'=>'یزد',
             '2106'=>'میبد',
-            '2202'=>'بندرعباس',
+            '2202'=>'بندرعباس',
             '2204'=>'قشم',
             '2301'=>'تهران',
@@ -430 +430 @@
             '2705'=>'گرگان',
             '2710'=>'آزادشهر',
-            '2706'=>'گنبدکاوس',
+            '2706'=>'گنبدکاوس',
             '2802'=>'بجنورد',
             '2901'=>'بیرجند',
@@ -442 +442 @@
     }
 
+
+
+
+
+
+
     public function get_store_city(){
         $current_city = $this->get_store_city_code_from_options();
@@ -448 +454 @@
 
     public function get_store_city_code_from_options(){
-        return get_option('woocommerce_store_city',0);
+        return get_option('podro_store_city',0);
+    }
+
+    public function get_store_address(){
+        return get_option('podro_store_address', '');
+    }
+    public function get_store_name(){
+        return get_option('podro_store_name', '');
     }
 

podro-wp/tags/1.0.6/vendor/autoload.php

@@ -10 +10 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitb472f25f5c4461cfd343527deda3d097::getLoader();
+return ComposerAutoloaderInit::getLoader();

podro-wp/tags/1.0.6/vendor/composer/autoload_classmap.php

@@ -119 +119 @@
     'WP_PODRO\\Engine\\API\\V1\\Routes' => $baseDir . '/inc/API/V1/Routes.php',
     'WP_PODRO\\Engine\\Api_Key' => $baseDir . '/inc/Api_Key.php',
+
     'WP_PODRO\\Engine\\Loader' => $baseDir . '/inc/Loader.php',
     'WP_PODRO\\Engine\\Location' => $baseDir . '/inc/Location.php',

podro-wp/tags/1.0.6/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitb472f25f5c4461cfd343527deda3d097
+class ComposerAutoloaderInit
 {
     private static $loader;
@@ -25 +25 @@
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInitb472f25f5c4461cfd343527deda3d097', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitb472f25f5c4461cfd343527deda3d097', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitb472f25f5c4461cfd343527deda3d097::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit::getInitializer($loader));
 
         $loader->register(true);

podro-wp/tags/1.0.6/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInitb472f25f5c4461cfd343527deda3d097
+class ComposerStaticInit
 {
     public static $prefixLengthsPsr4 = array (
@@ -152 +152 @@
         'WP_PODRO\\Engine\\API\\V1\\Routes' => __DIR__ . '/../..' . '/inc/API/V1/Routes.php',
         'WP_PODRO\\Engine\\Api_Key' => __DIR__ . '/../..' . '/inc/Api_Key.php',
+
         'WP_PODRO\\Engine\\Loader' => __DIR__ . '/../..' . '/inc/Loader.php',
         'WP_PODRO\\Engine\\Location' => __DIR__ . '/../..' . '/inc/Location.php',
@@ -166 +167 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitb472f25f5c4461cfd343527deda3d097::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitb472f25f5c4461cfd343527deda3d097::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitb472f25f5c4461cfd343527deda3d097::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit::$classMap;
 
         }, null, ClassLoader::class);

podro-wp/tags/1.0.6/vendor/composer/installed.php

@@ -6 +6 @@
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'e61c7f2401dc8fba00d50b7d6356693315103128',
+        'reference' => '',
         'name' => 'khorshid/wp_podro',
         'dev' => true,
@@ -35 +35 @@
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'e61c7f2401dc8fba00d50b7d6356693315103128',
+            'reference' => '',
             'dev_requirement' => false,
         ),

podro-wp/tags/1.0.6/wp-podro.php

@@ -10 +10 @@
  * Plugin URI:      https://khorshidlab.com/
  * Description:     پادروپین؛ ‌مارکت‌پلیس خدمات پستی است و به فروشگاه‌های آنلاین کمک می‌��ند تا فرآیند ارسال سفارش‌های اینترنتی را مدیریت کنند. در پادروپین، بدون مراجعه و یا ثبت قرارداد با شرکت‌های پستی، می‌توان سفارش‌های اینترنتی را با هر یک از شرکت‌های پستی ارسال کرد
- * Version:         1.0.5
+ * Version:         1.0.
  * Author:          Khorshid, Podro
  * Author URI:      https://khorshidlab.com/fa/
@@ -37 +37 @@
  */
 
-define( 'PODRO_VERSION', '1.0.5' );
+define( 'PODRO_VERSION', '1.0.' );
 define( 'PODRO_SLUG', 'podro-wp' );
+
+
 define( 'PODRO_NAME', 'WP PODRO' );
 define( 'PODRO_PLUGIN_ROOT', plugin_dir_path( __FILE__ ) );

podro-wp/trunk/README.txt

@@ -5 +5 @@
 Tested up to: 6.1
 Requires PHP: 7.2
-Stable tag: 1.0.5
+Stable tag: 1.0.
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -59 +59 @@
 == Changelog ==
 
+
+
+
+
+
 = 1.0.5 - 2022-12-25 =
 * Fix the cities js conflict in checkout page

podro-wp/trunk/admin/Enqueue.php

@@ -76 +76 @@
 
         if ( is_cart() || is_checkout() || is_wc_endpoint_url( 'edit-address' ) ) {
-            $city_select_path = PODRO_PLUGIN_ROOT_URL . 'assets/js/cities.js';
+
+            if ( function_exists( 'PWS' ) || class_exists('PWS_Core') || in_array( 'persian-woocommerce-shipping/woocommerce-shipping.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) ) {
+                $city_select_path = PODRO_PLUGIN_ROOT_URL . 'assets/js/cities.js';
+            }else{
+                $city_select_path = PODRO_PLUGIN_ROOT_URL . 'assets/js/only-podro-cities.js';
+            }
+
+
+
             wp_enqueue_script(
                 'wc-city-select',

podro-wp/trunk/admin/views/pages/api-key-settings.php

@@ -2 +2 @@
 $credentials_status = get_option( 'podro_plugin_status' );
 $credentials = get_option( 'podro_plugin_credentials', true );
+
+
+
+
 
 ?>
@@ -13 +17 @@
             <h1><?php  esc_html_e( 'تنظیمات عمومی پادرو', 'podro-wp' ) ?></h1>
             <h3><?php  esc_html_e( 'پیکربندی اتصال به پادرو پین', 'podro-wp' ) ?></h3>
-            <form class="wp_podro-config-form" method="post" action="<?php echo esc_url(admin_url( '/admin.php?page=' . PODRO_SLUG )); ?>">
+            <form class="wp_podro-config-form" method="post" action="<?php echo esc_url(admin_url( '/admin.php?page=' . PODRO_SETTINGS_PAGE_SLUG )); ?>">
+
                 <div class="pdo-box">
                     <label for="pdo_email">ایمیل</label>
@@ -22 +27 @@
                     <input type="password" name="pdo_password" id="pdo_password" autocomplete="off">
                 </div>
+
+
+
+
+
                 <h3><?php  esc_html_e( 'تنظیمات فروشگاه', 'podro-wp' ) ?></h3>
+
+
+
+
                 <div class="pdo-box">
 
@@ -28 +42 @@
                     <?php
                     $provinces = \WP_PODRO\Engine\WooSetting::get_provinces();
-                    echo "<select aria-label='شهر' class='wc-enhanced-select' id='podro_store_location' name='podro_store_location' style='width:325px;' >";
+                    echo "<select aria-label='شهر' class='wc-enhanced-select' id='podro_store_' style='width:325px;' >";
                     foreach($provinces as $province){
                         echo "<optgroup label='".esc_attr($province['name'])."'>";
                         foreach ($province['cities'] as $key=>$city)
-                            if(get_option('woocommerce_store_city') == $key)
+                            if(get_option('_store_city') == $key)
                                 echo "<option selected value='". esc_attr($key)."'>".esc_attr($city)."</option>";
                             else
@@ -48 +62 @@
                 </div>
                 <div class="pdo-box">
-                    <a class="get-api-key" href="https://podro.com/plugin-pin/" target="_blank" rel="noopener noreferrer"><?php  esc_html_e('دریافت کلید API', 'podro-wp'); ?></a>
+                    <label for="pdo_address">آدرس</label>
+                    <textarea name="podro_store_address" id="podro_store_address" ><?php  echo esc_attr( $store_address ?? '' )  ?></textarea>
                 </div>
-                <button type="submit" class="button button-primary" name="config_podro_api_key" value="1"><?php  esc_html_e( "ذخیره", 'podro-wp' ) ?></button>
+                <button type="submit" class="button button-primary" name="config_podro_" value="1"><?php  esc_html_e( "ذخیره", 'podro-wp' ) ?></button>
             </form>
         </div>

podro-wp/trunk/assets/css/admin.css

@@ -1 @@
-@font-face{font-family:IRANSansX;font-style:normal;font-weight:bold;src:url("../fonts/woff/IRANSansX-bold.woff") format("woff"),url("../fonts/woff2/IRANSansX-bold.woff2") format("woff2")}@font-face{font-family:IRANSansX;font-style:normal;font-weight:normal;src:url("../fonts/woff/IRANSansX-regular.woff") format("woff"),url("../fonts/woff2/IRANSansX-regular.woff2") format("woff2")}.pod-wrap,.toplevel_page_podro-wp,.pdo-wrapper,#woocommerce-order-podro,#woocommerce-order-podro h2,.pod-wrap h1,.pod-wrap h2,.pod-wrap h3{font-family:IRANSansX}#adminmenu #toplevel_page_podro-wp>a img{width:18px}.pod-footer{background-color:#883df2;border-radius:5px;padding:15px;display:flex;align-items:center;max-width:1202px;width:calc(100% - 30px);color:#fff}.pod-footer .pod-footer-links{width:70%;float:left}.pod-footer .pod-footer-links ul{width:100%}.pod-footer .pod-footer-links ul li{display:inline-block;margin-inline-end:15px;margin-bottom:0}.pod-footer .pod-footer-links ul li a{color:#fff;opacity:.7;text-decoration:none !important}.pod-footer .pod-footer-social{width:30%;float:right}.pod-footer .pod-footer-social .footer__social-icons{float:right;width:180px;text-align:left;direction:ltr;flex-direction:row;justify-content:space-between;display:flex}.pod-footer .pod-footer-social .footer__social-icons .footer__social-icons__link{display:block}.pod-footer .pod-footer-social .footer__social-icons .footer__social-icons__link svg{width:30px;height:30px}.pdo-wrapper{max-width:1232px;width:100%}.pdo-wrapper .pdo-card{max-width:1232px;width:calc(100% - 48px);background:#fff;background-color:#fff;box-shadow:0 2px 5px rgba(0,0,0,0.05);border-radius:5px;padding:24px;margin-bottom:20px}.pdo-box{width:390px;display:flex;align-items:center;justify-content:space-between;margin-bottom:12px}.pdo-box label{display:inline-block;height:22px;cursor:pointer;font-weight:bold}.pdo-box input{width:325px;text-align:left;direction:ltr}.pdo-box .get-api-key{display:block;width:100%;text-align:right;margin-top:10px;text-decoration:none !important}pre.xdebug-var-dump{margin-left:320px}.delivery_options{display:flex;margin-bottom:10px}.delivery_options .delivery_option{display:flex;align-items:center;flex-direction:column;padding:16px 12px;margin-bottom:10px;border:solid #bcbcbc 1px;border-radius:10px;margin-right:16px;width:136px}.delivery_options .delivery_option label{text-align:center}.delivery_options .delivery_option img{max-height:28px}ul.pod-delivery-step{display:flex;flex-direction:column;align-items:center;justify-content:center;margin-bottom:20px;margin-top:0}ul.pod-delivery-step li{display:flex;flex-direction:column;width:100%}ul.pod-delivery-step li.pod-dimension{background:#efefef;padding:10px;width:calc(100% - 20px);flex-wrap:wrap;flex-direction:row;margin-top:10px}ul.pod-delivery-step li.pod-dimension p{margin-top:0;width:100%}ul.pod-delivery-step li.pod-dimension>div{display:flex;flex-direction:column;width:33.33%}.pod-delivery-step-button{display:flex;align-items:center;justify-content:center;margin-top:10px;margin-bottom:10px;width:100%;max-width:100%;max-height:100%;cursor:pointer;background-color:#883df2;color:#fff;border:none;border-radius:5px;padding:10px;font-size:14px;font-weight:bold;text-decoration:none !important}.pod-delivery-cancel{display:flex;align-items:center;justify-content:center;margin-top:10px;margin-bottom:10px;width:100%;max-width:100%;max-height:100%;cursor:pointer;background-color:#b1b1b1;color:#fff;border:none;border-radius:5px;padding:10px;font-size:14px;font-weight:bold;text-decoration:none !important}.pod-delivery-step-2-wrapper{display:flex;flex-direction:column}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option{display:flex;flex-direction:row;flex-wrap:wrap;width:calc( 100% - 40px);align-items:center;margin-bottom:12px;border-radius:12px;background-color:#f3f3f3;padding:20px;border:solid 1px transparent;cursor:pointer}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option input{margin-left:10px}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option.active{border:solid 1px #893df2;box-shadow:0px 0px 11px -1px #893df24d}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option.active:checked::before{background-color:#883df2}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label .pod_delivery_option,.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label .pod_pickup_option{display:flex;align-items:center;flex-wrap:wrap}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label img{max-width:50px;max-height:40px;margin-left:4px}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label>p{flex:1 1 100%;margin:4px 0}.pod-pickup-step-3-option-wrapper,.pod-delivery-step-3-option-wrapper{display:flex;flex-wrap:wrap}.pod-pickup-step-3-option-wrapper .pod-pickup-step-3-option,.pod-pickup-step-3-option-wrapper .pod-delivery-step-3-option,.pod-delivery-step-3-option-wrapper .pod-pickup-step-3-option,.pod-delivery-step-3-option-wrapper .pod-delivery-step-3-option{padding:10px;margin-inline-end:10px;margin-bottom:10px;box-shadow:0px 0px 11px -1px #893df24d;border-radius:6px;cursor:pointer}.pod-pickup-step-3-option-wrapper .pod-pickup-step-3-option input,.pod-pickup-step-3-option-wrapper .pod-delivery-step-3-option input,.pod-delivery-step-3-option-wrapper .pod-pickup-step-3-option input,.pod-delivery-step-3-option-wrapper .pod-delivery-step-3-option input{display:none}.pod-pickup-step-3-option-wrapper .pod-pickup-step-3-option.active,.pod-pickup-step-3-option-wrapper .pod-delivery-step-3-option.active,.pod-delivery-step-3-option-wrapper .pod-pickup-step-3-option.active,.pod-delivery-step-3-option-wrapper .pod-delivery-step-3-option.active{border:solid 1px #893df2;box-shadow:0px 0px 11px -1px #893df24d}.pod-hide{display:none}.pod-show{display:block}.pod-flex{display:flex}.rtl .delivery_options .delivery_option label{margin:0 0 0 16px}select[name="pod_delivery_option_day"]{display:block;width:100%;margin-bottom:20px}#woocommerce-order-podro .inside{padding-top:12px}#woocommerce-order-podro #loading-circle{display:none;position:absolute;top:0;bottom:0;left:0;right:0;margin:auto;width:50px;height:50px;border:8px solid #f3f3f3;border-top:8px solid #893df2;border-radius:50%;animation:spin 0.6s ease-in infinite}#woocommerce-order-podro #lock-modal{display:none;background-color:#06282e9e;opacity:1;position:absolute;top:-6px;left:0;right:0;bottom:0}#woocommerce-order-podro h3,#woocommerce-order-podro h4{margin-top:0}input.pod-error,select.pod-error{border:solid 1px #ff0000}.pod_order_details{width:100%}.pod_order_details tbody tr td{padding:10px;background-color:#efefef}.pod_order_details tbody tr th{padding:2px 10px;background-color:#caa3ff}.pdo-about{font-size:18px}.rtl .pod-footer .pod-footer-social{float:left}.rtl .pod-footer .pod-footer-social .footer__social-icons{float:left}#get_order_pdf,.get_order_pdf,#pod-cancel-order,.pod-cancel-order{cursor:pointer}
+@font-face{font-family:IRANSansX;font-style:normal;font-weight:bold;src:url("../fonts/woff/IRANSansX-bold.woff") format("woff"),url("../fonts/woff2/IRANSansX-bold.woff2") format("woff2")}@font-face{font-family:IRANSansX;font-style:normal;font-weight:normal;src:url("../fonts/woff/IRANSansX-regular.woff") format("woff"),url("../fonts/woff2/IRANSansX-regular.woff2") format("woff2")}.pod-wrap,.toplevel_page_podro-wp,.pdo-wrapper,#woocommerce-order-podro,#woocommerce-order-podro h2,.pod-wrap h1,.pod-wrap h2,.pod-wrap h3{font-family:IRANSansX}#adminmenu #toplevel_page_podro-wp>a img{width:18px}.pod-footer{background-color:#883df2;border-radius:5px;padding:15px;display:flex;align-items:center;max-width:1202px;width:calc(100% - 30px);color:#fff}.pod-footer .pod-footer-links{width:70%;float:left}.pod-footer .pod-footer-links ul{width:100%}.pod-footer .pod-footer-links ul li{display:inline-block;margin-inline-end:15px;margin-bottom:0}.pod-footer .pod-footer-links ul li a{color:#fff;opacity:.7;text-decoration:none !important}.pod-footer .pod-footer-social{width:30%;float:right}.pod-footer .pod-footer-social .footer__social-icons{float:right;width:180px;text-align:left;direction:ltr;flex-direction:row;justify-content:space-between;display:flex}.pod-footer .pod-footer-social .footer__social-icons .footer__social-icons__link{display:block}.pod-footer .pod-footer-social .footer__social-icons .footer__social-icons__link svg{width:30px;height:30px}.pdo-wrapper{max-width:1232px;width:100%}.pdo-wrapper .pdo-card{max-width:1232px;width:calc(100% - 48px);background:#fff;background-color:#fff;box-shadow:0 2px 5px rgba(0,0,0,0.05);border-radius:5px;padding:24px;margin-bottom:20px}.pdo-box{width:390px;display:flex;align-items:center;justify-content:space-between;margin-bottom:12px}.pdo-box label{display:inline-block;height:22px;cursor:pointer;font-weight:bold}.pdo-box input{width:325px;text-align:left;direction:ltr}.pdo-box .get-api-key{display:block;width:100%;text-align:right;margin-top:10px;text-decoration:none !important}pre.xdebug-var-dump{margin-left:320px}.delivery_options{display:flex;margin-bottom:10px}.delivery_options .delivery_option{display:flex;align-items:center;flex-direction:column;padding:16px 12px;margin-bottom:10px;border:solid #bcbcbc 1px;border-radius:10px;margin-right:16px;width:136px}.delivery_options .delivery_option label{text-align:center}.delivery_options .delivery_option img{max-height:28px}ul.pod-delivery-step{display:flex;flex-direction:column;align-items:center;justify-content:center;margin-bottom:20px;margin-top:0}ul.pod-delivery-step li{display:flex;flex-direction:column;width:100%}ul.pod-delivery-step li.pod-dimension{background:#efefef;padding:10px;width:calc(100% - 20px);flex-wrap:wrap;flex-direction:row;margin-top:10px}ul.pod-delivery-step li.pod-dimension p{margin-top:0;width:100%}ul.pod-delivery-step li.pod-dimension>div{display:flex;flex-direction:column;width:33.33%}.pod-delivery-step-button{display:flex;align-items:center;justify-content:center;margin-top:10px;margin-bottom:10px;width:100%;max-width:100%;max-height:100%;cursor:pointer;background-color:#883df2;color:#fff;border:none;border-radius:5px;padding:10px;font-size:14px;font-weight:bold;text-decoration:none !important}.pod-delivery-cancel{display:flex;align-items:center;justify-content:center;margin-top:10px;margin-bottom:10px;width:100%;max-width:100%;max-height:100%;cursor:pointer;background-color:#b1b1b1;color:#fff;border:none;border-radius:5px;padding:10px;font-size:14px;font-weight:bold;text-decoration:none !important}.pod-delivery-step-2-wrapper{display:flex;flex-direction:column}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option{display:flex;flex-direction:row;flex-wrap:wrap;width:calc( 100% - 40px);align-items:center;margin-bottom:12px;border-radius:12px;background-color:#f3f3f3;padding:20px;border:solid 1px transparent;cursor:pointer}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option input{margin-left:10px}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option.active{border:solid 1px #893df2;box-shadow:0px 0px 11px -1px #893df24d}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option.active:checked::before{background-color:#883df2}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label .pod_delivery_option,.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label .pod_pickup_option{display:flex;align-items:center;flex-wrap:wrap}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label img{max-width:50px;max-height:40px;margin-left:4px}.pod-delivery-step-2-wrapper .pod-delivery-step-2-option label>p{flex:1 1 100%;margin:4px 0}.pod-pickup-step-3-option-wrapper,.pod-delivery-step-3-option-wrapper{display:flex;flex-wrap:wrap}.pod-pickup-step-3-option-wrapper .pod-pickup-step-3-option,.pod-pickup-step-3-option-wrapper .pod-delivery-step-3-option,.pod-delivery-step-3-option-wrapper .pod-pickup-step-3-option,.pod-delivery-step-3-option-wrapper .pod-delivery-step-3-option{padding:10px;margin-inline-end:10px;margin-bottom:10px;box-shadow:0px 0px 11px -1px #893df24d;border-radius:6px;cursor:pointer}.pod-pickup-step-3-option-wrapper .pod-pickup-step-3-option input,.pod-pickup-step-3-option-wrapper .pod-delivery-step-3-option input,.pod-delivery-step-3-option-wrapper .pod-pickup-step-3-option input,.pod-delivery-step-3-option-wrapper .pod-delivery-step-3-option input{display:none}.pod-pickup-step-3-option-wrapper .pod-pickup-step-3-option.active,.pod-pickup-step-3-option-wrapper .pod-delivery-step-3-option.active,.pod-delivery-step-3-option-wrapper .pod-pickup-step-3-option.active,.pod-delivery-step-3-option-wrapper .pod-delivery-step-3-option.active{border:solid 1px #893df2;box-shadow:0px 0px 11px -1px #893df24d}.pod-hide{display:none}.pod-show{display:block}.pod-flex{display:flex}.rtl .delivery_options .delivery_option label{margin:0 0 0 16px}select[name="pod_delivery_option_day"]{display:block;width:100%;margin-bottom:20px}#woocommerce-order-podro .inside{padding-top:12px}#woocommerce-order-podro #loading-circle{display:none;position:absolute;top:0;bottom:0;left:0;right:0;margin:auto;width:50px;height:50px;border:8px solid #f3f3f3;border-top:8px solid #893df2;border-radius:50%;animation:spin 0.6s ease-in infinite}#woocommerce-order-podro #lock-modal{display:none;background-color:#06282e9e;opacity:1;position:absolute;top:-6px;left:0;right:0;bottom:0}#woocommerce-order-podro h3,#woocommerce-order-podro h4{margin-top:0}input.pod-error,select.pod-error{border:solid 1px #ff0000}.pod_order_details{width:100%}.pod_order_details tbody tr td{padding:10px;background-color:#efefef}.pod_order_details tbody tr th{padding:2px 10px;background-color:#caa3ff}.pdo-about{font-size:18px}.rtl .pod-footer .pod-footer-social{float:left}.rtl .pod-footer .pod-footer-social .footer__social-icons{float:left}#get_order_pdf,.get_order_pdf,#pod-cancel-order,.pod-cancel-order{cursor:pointer}

podro-wp/trunk/assets/js/cities.js

@@ -1 +1 @@
 jQuery(document).ready(function(){
 
-    jQuery('body').on('country_to_state_changed', function(p1,country){
 
-        if( 'IR' == country ){
-            //
-            jQuery('input#billing_city').replaceWith('<select id="billing_city" name="billing_city"></select>');
-            jQuery('input#shipping_city').replaceWith('<select id="shipping_city" name="shipping_city"></select>');
-            jQuery('select#billing_city').selectWoo();
-            jQuery('select#shipping_city').selectWoo();
-            getCities();
+    const data = {
+        action:'get_podro_cities',
+        method:'post'
+    }
+    ajaxRequest(data, podro_cities_callback, null);
+    let cities = [];
+    function podro_cities_callback(response, element){
+        cities = response;
+
+    }
+
+    jQuery('#billing_city').on('change', function(){
+
+        if( !is_this_podro_city(cities,jQuery(this).find('option:selected').text())){
+            jQuery("[id*='podro_method']").prop('disabled', true);
+            jQuery("[id*='podro_method']").prop('checked',false);
+            jQuery("[id*='podro_method']").removeAttr('checked');
+            const count = jQuery(this).find('#shipping_method input[type=radio]:checked').length;
+            if(count > 0)
+                return;
+            if(!jQuery('#shipping_method input[type=radio]:checked').attr('id'))
+                jQuery("[id*='podro_method']").parent().next('li').find("input[type=radio]").prop('checked',true);
         }else{
-            jQuery('#billing_city').parent().find('.select2').remove();
-            jQuery('#shipping_city').parent().find('.select2').remove();
-            jQuery('#billing_city').replaceWith('<input type="text" name="billing_city" id="billing_city" class="input-text "/>');
-            jQuery('#shipping_city').replaceWith('<input type="text" name="shipping_city" id="shipping_city" class="input-text "/>');
+            jQuery("[id*='podro_method']").prop('disabled',false);
+
         }
     });
 
-    function getCities(){
-        jQuery('#billing_state, body').change(function(){
-            const province_code = jQuery(this).val();
-            const element = jQuery('#billing_city');
-            if(!province_code)
+    jQuery('body').on('updated_checkout', function() {
+        if( !is_this_podro_city(cities,jQuery('#billing_city').find('option:selected').text())){
+
+            jQuery("[id*='podro_method']").prop('disabled', true);
+            jQuery("[id*='podro_method']").prop('checked',false);
+            jQuery("[id*='podro_method']").removeAttr('checked');
+            const count = jQuery(this).find('#shipping_method input[type=radio]:checked').length;
+            if(count > 0)
                 return;
-            const data = {
-                action:'get_podro_cities_by_province',
-                //security: wp_podro_ajax_object.security,
-                province: province_code
-            };
 
-            ajaxRequest(data, callbackGetCities, element);
+
+            if(!jQuery('#shipping_method input[type=radio]:checked').attr('id'))
+                jQuery("[id*='podro_method']").parent().next('li').find("input[type=radio]").prop('checked',true);
+        }else{
+            jQuery("[id*='podro_method']").prop('disabled',false);
+
+
+        }
+    });
+
+
+    function is_this_podro_city(city_list, name){
+
+        let result = false;
+        Object.keys(city_list).forEach(key => {
+
+            if(  city_list[key] === name ){
+                result = true;
+                return result;
+            }
+
 
         });
+
+
 
-        jQuery('#shipping_state, body').change(function(){
-            const province_code = jQuery(this).val();
-            const element = jQuery('#shipping_city');
-            if(!province_code)
-                return;
-            const data = {
-                action:'get_podro_cities_by_province',
-                //security: wp_podro_ajax_object.security,
-                province: province_code
-            };
-
-            ajaxRequest(data, callbackGetCities, element);
-        });
-
-    }
 
     function callbackGetCities(response, element){
@@ -59 +76 @@
 
         Object.keys(cities).forEach(function(key) {
-            console.log('Key : ' + key + ', Value : ' + cities[key])
+
             element.append(`<option value='${key}'>${cities[key]}</option>`);
 

podro-wp/trunk/inc/Api_Key.php

@@ -77 +77 @@
     public static function set_pdo_api_key() {
 
-        if( ! isset( $_POST[ 'config_podro_api_key' ] ) ) {
-            return;
-        }
-        update_option('woocommerce_store_city', sanitize_text_field($_POST['podro_store_location']));
-        $pdo_email = sanitize_email( $_POST[ 'pdo_email' ] );
-        $pdo_password = sanitize_text_field( $_POST[ 'pdo_password' ] );
-        if ( $pdo_email == null || $pdo_password == null || ( ! empty( $pdo_email ) && !empty( $pdo_password ) && $pdo_password === "**************" ) ) {
-            add_action( 'admin_notices', function () {
-                echo wp_kses_post('<div class="notice notice-error is-dismissible">
+
+
+        if(  isset( $_POST[ 'config_podro_api_key' ] ) ) {
+            $pdo_email = sanitize_email( $_POST[ 'pdo_email' ] );
+            $pdo_password = sanitize_text_field( $_POST[ 'pdo_password' ] );
+            if ( $pdo_email == null || $pdo_password == null || ( ! empty( $pdo_email ) && !empty( $pdo_password ) && $pdo_password === "**************" ) ) {
+                add_action( 'admin_notices', function () {
+                    echo wp_kses_post('<div class="notice notice-error is-dismissible">
                         <p>'. esc_html__( "لطفا موارد موردنیاز را وارد کنید.", 'podro-wp' ) .'</p>
+
                     </div>');
-            } );
-            return false;
-        }
+            } );
+            return false;
+        }
 
-        if ( !$token = self::validate_api_key( $pdo_email, (new Encryption)->encrypt($pdo_password) ) ) {
-            return false;
-        }
+        if ( !$token = self::validate_api_key( $pdo_email, (new Encryption)->encrypt($pdo_password) ) ) {
+            return false;
+        }
 
-        $save_settings = update_option( 'podro_api_key', (new Encryption)->encrypt($token) );
+        $save_settings = update_option( 'podro_api_key', (new Encryption)->encrypt($token) );
 
-        if( $save_settings ) {
-            update_option( 'podro_plugin_status', 'connected');
-            update_option( 'podro_plugin_credentials', [
-                'email' => $pdo_email,
-                'password' => (new Encryption)->encrypt($pdo_password),
-            ]);
+        if( $save_settings ) {
+            update_option( 'podro_plugin_status', 'connected');
+            update_option( 'podro_plugin_credentials', [
+                'email' => $pdo_email,
+                'password' => (new Encryption)->encrypt($pdo_password),
+            ]);
 
-            wp_redirect( home_url( '/wp-admin/admin.php?page=' . PODRO_SLUG ) );
+                wp_redirect( home_url( '/wp-admin/admin.php?page=' . PODRO_SETTINGS_PAGE_SLUG ) );
+
+                add_action( 'admin_notices', function () {
+                    echo wp_kses_post('<div class="notice notice-success is-dismissible">
+                        <p>'. esc_html__( "تنظیمات ذخیره شد.", 'wp-podro' ) .'</p>
+                    </div>');
+                } );
+            }
+        }else if( isset($_POST['config_podro_store_info']) ){
+
+            if( empty($_POST['podro_store_name']) || empty($_POST['podro_store_address']) ){
+                add_action( 'admin_notices', function () {
+                    echo wp_kses_post('<div class="notice notice-error is-dismissible">
+                        <p>'. esc_html__( "نام فروشگاه، شهرو آدرس نمی تواند خالی باشد", 'wp-podro' ) .'</p>
+                    </div>');
+                } );
+                return false;
+            }
+
+            update_option('podro_store_name', sanitize_text_field($_POST['podro_store_name']??''));
+            update_option('podro_store_city', sanitize_text_field($_POST['podro_store_city']??''));
+            update_option('podro_store_address', sanitize_text_field($_POST['podro_store_address']??''));
+
 
             add_action( 'admin_notices', function () {
@@ -111 +133 @@
                         <p>'. esc_html__( "تنظیمات ذخیره شد.", 'podro-wp' ) .'</p>
                     </div>');
-            } );
+            });
         }
+
 
     }

podro-wp/trunk/inc/MetaBox.php

@@ -136 +136 @@
         $woo_setting = WooSetting::get_instance();
 
-        $source_city = $woo_setting->get_store_city_code_from_options();
+
         $order_id = $order->get_id();
         $destination_city_code = $order->get_shipping_city();
+
+
+
+
+
+
+
+
 
         $destination_city_name = (WooSetting::get_instance())->get_cities()[$destination_city_code];
@@ -144 +152 @@
         if( mb_strlen($destination_address) > $this->address_length )
             $destination_address = mb_substr($destination_address, 0, $this->address_length);
-        $store_address = $woo_setting->get_store_city() . ' ' . get_option( 'woocommerce_store_address' ) . get_option( 'woocommerce_store_address_2' );
+
+
+        $pod_source_city_code = $woo_setting->get_store_city_code_from_options();
+        $pod_store_address =  mb_substr($woo_setting->get_store_city() . ' ' . $woo_setting->get_store_address() , 0 , $this->address_length) ;
+        $pod_store_name =  mb_substr( $woo_setting->get_store_name(), 0, $this->store_name_length );
 
         $total_weight = 0;
@@ -183 +195 @@
         $user_billing_family = $order->get_billing_last_name();
 
-        $store_name = $this->get_store_name();
+
         $customer_note = $order->get_customer_note();
 
-        $option_pod_source_city = get_option('pod_source_city',false);
-        $option_pod_store_name = get_option('pod_store_name',false);
-
-        $option_pod_source_city = ( false == $option_pod_source_city ) ? $store_address : $option_pod_source_city;
-        $option_pod_store_name = ( false == $option_pod_store_name ) ?  $store_name : $option_pod_store_name;
+
+
 
 
@@ -198 +207 @@
             <li>
                 <label for="pod_store_name">نام فروشگاه</label>
-                <input type="text" name="pod_store_name" id="pod_store_name" maxlength="60" value="<?php echo esc_attr($option_pod_store_name); ?>"  />
+                <input type="text" name="pod_store_name" id="pod_store_name" maxlength="60" value="<?php echo esc_attr($pod_store_name); ?>"  />
             </li>
             <li>
                 <label for="pod_source_city">مبدا</label>
-                <textarea name="pod_source_city" id="pod_source_city" rows="6"><?php echo esc_attr($option_pod_source_city); ?></textarea>
-                <?php if (empty($store_address)) echo '<p style="color:red">'. esc_html__('لطفا آدرس فروشگاه را از تنظیمات ووکامرس وارد کنید.', 'podro-wp') .'</p>' ; ?>
-                <input type="hidden" id="pod_source_city_code" name="pod_source_city_code" value="<?php echo esc_attr($source_city); ?>">
+                <textarea name="pod_source_city" id="pod_source_city" rows="6"><?php echo esc_attr($); ?></textarea>
+                <?php if (empty($store_address)) echo '<p style="color:red">'. esc_html__('لطفا آدرس فروشگاه را از تنظیمات ووکامرس وارد کنید.', 'podro-wp') .'</p>' ; ?>
+                <input type="hidden" id="pod_source_city_code" name="pod_source_city_code" value="<?php echo esc_attr($); ?>">
             </li>
             <li>

podro-wp/trunk/inc/Podro_Order_Table.php

@@ -105 +105 @@
         foreach ($orders as $order){
 
-            if ( $order['status'] == 'لغو شده') {
-                $cancel_order = 'از پیش لغو شده';
+            if ( $order['status'] == 'درحال پردازش' ||
+                $order['status'] == 'ثبت اولیه' ||
+                $order['status'] == 'در حال بررسی تاخیر' ) {
+                $cancel_order = '<a class="pod-cancel-order" data-order_id="' . $order['id'] . '">لغو ارسال</a>';
             } else {
-                $cancel_order = '<a class="pod-cancel-order" data-order_id="' . $order['id'] . '">لغو ارسال</a>';
+                $cancel_order = ;
             }
 

podro-wp/trunk/inc/Setup.php

@@ -17 +17 @@
  * @link      https://github.com/KhorshidLab/WP-Podro
  */
+
+
 use WP_PODRO\Admin\Enqueue;
 use WP_PODRO\Engine\API\V1\Payments;
+
 
 class Setup {
@@ -85 +88 @@
      * @access   private
      */
+
+
+
+
+
+
+
+
+
     private function load_dependencies() {
 
@@ -91 +103 @@
         $this->loader = new Loader();
 
-        add_action('woocommerce_loaded', function(){
-
-
-        // Disable Persian Woocommerce City Select
-        if ( function_exists( 'PW' ) && PW()->get_options( 'enable_iran_cities' ) != 'no' ) {
-            $settings                       = PW()->get_options();
-            $settings['enable_iran_cities'] = 'no';
-            update_option( 'PW_Options', $settings );
-        }
-
-        // Disable Persian Woocommerce shipping City Select
-        if ( function_exists( 'PWS' ) || class_exists('PWS_Core') || in_array( 'persian-woocommerce-shipping/woocommerce-shipping.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) ) {
-
-            $pws = \PWS_Core::instance();
-
-
-            // Filters
-            remove_filter( 'woocommerce_states', [ $pws, 'iran_states' ], 20, 1 );
-            remove_filter( 'woocommerce_checkout_process', [ $pws, 'checkout_process' ], 20, 1 );
-
-
-            add_action( 'wp_enqueue_scripts', function() {
-                wp_dequeue_script( 'pwsCheckout' );
-            }, 999999 );
-
-
-
-}
-
-        }, 21);
-
-        if ( class_exists('WC_City_Select') ) {
-
-            $WC_City_Select = new WC_City_Select;
-
-            $this->loader->add_filter( 'woocommerce_billing_fields', $WC_City_Select, 'billing_fields', 999999, 2 );
-            $this->loader->add_filter( 'woocommerce_shipping_fields', $WC_City_Select, 'shipping_fields', 999999, 2 );
-            $this->loader->add_filter( 'woocommerce_form_field_city', $WC_City_Select, 'form_field_city', 999999, 4 );
-
-        }
+
+
+        add_action( 'wp_ajax_nopriv_get_podro_cities', [$this, 'podro_get_cities'] );
+        add_action( 'wp_ajax_get_podro_cities', [$this, 'podro_get_cities'] );
+
+
 
         $this->loader->add_action( 'admin_init', $Api_Key, 'set_pdo_api_key' );
@@ -269 +247 @@
                 __( 'تنظیمات', 'podro-wp' ),
                 'manage_options',
-                PODRO_SLUG . '-settings',
+                PODRO_S,
                 [$this, 'settings_page'],
             );

podro-wp/trunk/inc/WooSetting.php

@@ -356 +356 @@
             '0006'=>'ساوه',
             '0005'=>'دلیجان',
-            '0101'=>'آستارا',
-            '0103'=>'بندرانزلی',
+            '0101'=>'آستارا',
+            '0103'=>'بندرانزلی',
             '0105'=>'رشت',
             '0111'=>'لاهیجان',
@@ -367 +367 @@
             '0206'=>'رامسر',
             '0207'=>'ساری',
-            '0210'=>'قائم شهر',
+            '0210'=>'قائمشهر',
             '0214'=>'نور',
             '0215'=>'نوشهر',
@@ -392 +392 @@
             '0808'=>'کرمان',
             '0908'=>'سبزوار',
-            '0916'=>'مشهد',
+            '0916'=>'مشهد',
             '0917'=>'نیشابور',
             '1002'=>'اصفهان',
             '1009'=>'شهرضا',
             '1010'=>'کاشان',
-            '1018'=>'آران وبیدگل',
+            '1018'=>'آران وبیدگل',
             '1102'=>'چابهار',
             '1105'=>'زاهدان',
@@ -405 +405 @@
             '1401'=>'بروجن',
             '1402'=>'شهرکرد',
-            '1503'=>'خرم آباد',
+            '1503'=>'خرمآباد',
             '1601'=>'ایلام',
             '1703'=>'گچساران',
-            '1801'=>'بوشهر',
+            '1801'=>'بوشهر',
             '1810'=>'عسلویه',
             '1901'=>'ابهر',
@@ -419 +419 @@
             '2105'=>'یزد',
             '2106'=>'میبد',
-            '2202'=>'بندرعباس',
+            '2202'=>'بندرعباس',
             '2204'=>'قشم',
             '2301'=>'تهران',
@@ -430 +430 @@
             '2705'=>'گرگان',
             '2710'=>'آزادشهر',
-            '2706'=>'گنبدکاوس',
+            '2706'=>'گنبدکاوس',
             '2802'=>'بجنورد',
             '2901'=>'بیرجند',
@@ -442 +442 @@
     }
 
+
+
+
+
+
+
     public function get_store_city(){
         $current_city = $this->get_store_city_code_from_options();
@@ -448 +454 @@
 
     public function get_store_city_code_from_options(){
-        return get_option('woocommerce_store_city',0);
+        return get_option('podro_store_city',0);
+    }
+
+    public function get_store_address(){
+        return get_option('podro_store_address', '');
+    }
+    public function get_store_name(){
+        return get_option('podro_store_name', '');
     }
 

podro-wp/trunk/vendor/autoload.php

@@ -10 +10 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitb472f25f5c4461cfd343527deda3d097::getLoader();
+return ComposerAutoloaderInit::getLoader();

podro-wp/trunk/vendor/composer/autoload_classmap.php

@@ -119 +119 @@
     'WP_PODRO\\Engine\\API\\V1\\Routes' => $baseDir . '/inc/API/V1/Routes.php',
     'WP_PODRO\\Engine\\Api_Key' => $baseDir . '/inc/Api_Key.php',
+
     'WP_PODRO\\Engine\\Loader' => $baseDir . '/inc/Loader.php',
     'WP_PODRO\\Engine\\Location' => $baseDir . '/inc/Location.php',

podro-wp/trunk/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitb472f25f5c4461cfd343527deda3d097
+class ComposerAutoloaderInit
 {
     private static $loader;
@@ -25 +25 @@
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInitb472f25f5c4461cfd343527deda3d097', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitb472f25f5c4461cfd343527deda3d097', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitb472f25f5c4461cfd343527deda3d097::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit::getInitializer($loader));
 
         $loader->register(true);

podro-wp/trunk/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInitb472f25f5c4461cfd343527deda3d097
+class ComposerStaticInit
 {
     public static $prefixLengthsPsr4 = array (
@@ -152 +152 @@
         'WP_PODRO\\Engine\\API\\V1\\Routes' => __DIR__ . '/../..' . '/inc/API/V1/Routes.php',
         'WP_PODRO\\Engine\\Api_Key' => __DIR__ . '/../..' . '/inc/Api_Key.php',
+
         'WP_PODRO\\Engine\\Loader' => __DIR__ . '/../..' . '/inc/Loader.php',
         'WP_PODRO\\Engine\\Location' => __DIR__ . '/../..' . '/inc/Location.php',
@@ -166 +167 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitb472f25f5c4461cfd343527deda3d097::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitb472f25f5c4461cfd343527deda3d097::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitb472f25f5c4461cfd343527deda3d097::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit::$classMap;
 
         }, null, ClassLoader::class);

podro-wp/trunk/vendor/composer/installed.php

@@ -6 +6 @@
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'e61c7f2401dc8fba00d50b7d6356693315103128',
+        'reference' => '',
         'name' => 'khorshid/wp_podro',
         'dev' => true,
@@ -35 +35 @@
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'e61c7f2401dc8fba00d50b7d6356693315103128',
+            'reference' => '',
             'dev_requirement' => false,
         ),

podro-wp/trunk/wp-podro.php

@@ -10 +10 @@
  * Plugin URI:      https://khorshidlab.com/
  * Description:     پادروپین؛ ‌مارکت‌پلیس خدمات پستی است و به فروشگاه‌های آنلاین کمک می‌کند تا فرآیند ارسال سفارش‌های اینترنتی را مدیریت کنند. در پادروپین، بدون مراجعه و یا ثبت قرارداد با شرکت‌های پستی، می‌توان سفارش‌های اینترنتی را با هر یک از شرکت‌های پستی ارسال کرد
- * Version:         1.0.5
+ * Version:         1.0.
  * Author:          Khorshid, Podro
  * Author URI:      https://khorshidlab.com/fa/
@@ -37 +37 @@
  */
 
-define( 'PODRO_VERSION', '1.0.5' );
+define( 'PODRO_VERSION', '1.0.' );
 define( 'PODRO_SLUG', 'podro-wp' );
+
+
 define( 'PODRO_NAME', 'WP PODRO' );
 define( 'PODRO_PLUGIN_ROOT', plugin_dir_path( __FILE__ ) );