Changeset 3304545
- Timestamp:
- 06/02/2025 12:36:06 AM (10 months ago)
- Location:
- mshop-npay/trunk
- Files:
-
- 5 edited
-
includes/admin/settings/class-mnp-settings.php (modified) (1 diff)
-
includes/class-mnp-order.php (modified) (3 diffs)
-
includes/mnp-functions.php (modified) (1 diff)
-
mshop-npay.php (modified) (2 diffs)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
mshop-npay/trunk/includes/admin/settings/class-mnp-settings.php
r3145662 r3304545 738 738 array( 739 739 'type' => 'Section', 740 'title' => __( '재고관리', 'mshop-npay' ),741 'elements' => array(742 array(743 "id" => "mnp-use-stock-management",744 "title" => "재고관리 기능 사용",745 "className" => "",746 "type" => "Toggle",747 "default" => "yes",748 "desc" => __( "<div class='desc2'>우커머스의 기본 재고관리 기능을 사용하시려면 비활성화 합니다.</div>", 'mshop-npay' )749 )750 )751 ),752 array(753 'type' => 'Section',754 740 'title' => __( '도서공연비 소득공제', 'mshop-npay' ), 755 741 'elements' => array( -
mshop-npay/trunk/includes/class-mnp-order.php
r3251922 r3304545 490 490 $order->update_meta_data( '_naverpay_order_id', $npay_order->Order->OrderID ); 491 491 $order->update_meta_data( '_naverpay_product_order_id', implode( ',', $product_order_ids ) ); 492 self::update_stock( $order, $npay_orders );493 492 self::update_shipping( $order, $npay_orders ); 494 493 self::update_order_status( $order, $npay_orders ); … … 537 536 } 538 537 self::update_npay_fee_items( $order, $npay_orders ); 539 self::update_stock( $order, $npay_orders );540 538 $order->save(); 541 539 $order = wc_get_order( $order->get_id() ); … … 790 788 } 791 789 } 792 public static function update_stock( $order, $npay_orders ) {793 794 if ( 'no' == get_option( 'mnp-use-stock-management', 'yes' ) ) {795 return;796 }797 798 $stock = json_decode( $order->get_meta( '_naverpay_manage_stock' ), true );799 800 if ( empty( $stock ) ) {801 $stock = array();802 }803 804 foreach ( $npay_orders as $npay_order ) {805 $product = wc_get_product( $npay_order->ProductOrder->SellerProductCode );806 807 if ( $product && $product->managing_stock() ) {808 switch ( $npay_order->ProductOrder->ProductOrderStatus ) {809 case MNP_Manager::PRODUCT_ORDER_STATUS_PAYMENT_WAITING :810 case MNP_Manager::PRODUCT_ORDER_STATUS_PAYED :811 if ( 'reduced' != $stock[ $product->get_id() ] ) {812 $stock_change = $npay_order->ProductOrder->Quantity;813 $new_stock = $product->reduce_stock( $stock_change );814 $stock[ $product->get_id() ] = 'reduced';815 816 $order->add_order_note( sprintf( __( 'Item #%s stock reduced from %s to %s.', 'woocommerce' ), $npay_order->ProductOrder->SellerProductCode, $new_stock + $stock_change, $new_stock ) );817 $order->send_stock_notifications( $product, $new_stock, $npay_order->ProductOrder->Quantity );818 }819 break;820 case MNP_Manager::PRODUCT_ORDER_STATUS_CANCELED :821 case MNP_Manager::PRODUCT_ORDER_STATUS_RETURNED :822 case MNP_Manager::PRODUCT_ORDER_STATUS_CANCELED_BY_NOPAYMENT :823 if ( 'reduced' == $stock[ $product->get_id() ] ) {824 $old_stock = $product->stock;825 $stock_change = $npay_order->ProductOrder->Quantity;826 $new_quantity = $product->increase_stock( $stock_change );827 828 $stock[ $product->get_id() ] = '';829 $order->add_order_note( sprintf( __( 'Item #%s stock increased from %s to %s.', 'woocommerce' ), $product->get_id(), $old_stock, $new_quantity ) );830 }831 break;832 }833 }834 }835 836 $order->update_meta_data( '_naverpay_manage_stock', json_encode( $stock ) );837 }838 839 public static function woocommerce_payment_complete_reduce_order_stock( $stock_reduced, $order_id ) {840 $order = wc_get_order( $order_id );841 842 if ( $order && 'naverpay' == $order->get_payment_method() && 'yes' == get_option( 'mnp-use-stock-management', 'yes' ) ) {843 $stock_reduced = false;844 }845 846 return $stock_reduced;847 }848 790 849 791 public static function migrate_npay_order( $order_id ) { -
mshop-npay/trunk/includes/mnp-functions.php
r3026591 r3304545 29 29 add_filter( 'woocommerce_cancel_unpaid_order', 'MNP_Order::woocommerce_cancel_unpaid_order', 10, 2 ); 30 30 add_filter( 'woocommerce_order_needs_shipping_address', 'MNP_Order::woocommerce_order_needs_shipping_address', 10, 3 ); 31 add_filter( 'woocommerce_payment_complete_reduce_order_stock', 'MNP_Order::woocommerce_payment_complete_reduce_order_stock', 10, 2 );32 31 33 32 add_action( 'woocommerce_after_order_itemmeta', 'MNP_Order_Item::woocommerce_after_order_itemmeta', 10, 3 ); -
mshop-npay/trunk/mshop-npay.php
r3260543 r3304545 4 4 Plugin URI: 5 5 Description: 코드엠샵에서 개발, 운영되는 네이버페이 - 주문형 결제 시스템으로 네이버페이센터 어드민과 연동합니다. 6 Version: 3.5. 06 Version: 3.5.1 7 7 Author: CodeMShop 8 8 Author URI: www.codemshop.com … … 20 20 21 21 protected static $_instance = null; 22 public $version = '3.5. 0';22 public $version = '3.5.1'; 23 23 public $plugin_url; 24 24 public $naverpay_register_order_url; -
mshop-npay/trunk/readme.txt
r3278720 r3304545 6 6 Tested up to: 6.8 7 7 Requires PHP: 7.0 8 Stable tag: 3.5. 08 Stable tag: 3.5.1 9 9 License: GPLv2 or later 10 10 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 79 79 80 80 == Changelog == 81 82 = 3.5.1 = 83 우커머스 구버전 지원을 위한 재고관리 옵션 삭제 81 84 82 85 = 3.5.0 =
Note: See TracChangeset
for help on using the changeset viewer.