Commit f96198a4 authored by Vlad Proshin's avatar Vlad Proshin
Browse files

Issue #3179533 by zenimagine: Integrate shipping method management (2 commit)

parent a8bf0187

commerce_marketplace.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,6 @@ config_devel: 
    - views.view.commerce_marketplace_administer_stores

    - views.view.commerce_marketplace_administer_products

    - views.view.commerce_marketplace_store_orders

    - views.view.commerce_marketpplace_administer_shipping_methods

    - views.view.commerce_marketplace_administer_shipping_methods

  optional:

    - commerce_marketplace.settings

commerce_marketplace.install

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ function commerce_marketplace_uninstall() { 
    'views.view.commerce_marketplace_administer_stores',

    'views.view.commerce_marketplace_administer_products',

    'views.view.commerce_marketplace_store_orders',

    'views.view.commerce_marketpplace_administer_shipping_methods',

    'views.view.commerce_marketplace_administer_shipping_methods',

  ];



  foreach ($configurations as $name) {
@@ -145,7 +145,7 @@ function commerce_marketplace_uninstall() { 
function commerce_marketplace_update_8201() {

  $config = \Drupal::configFactory();

  $configurations = [

    'views.view.commerce_marketpplace_administer_shipping_methods',

    'views.view.commerce_marketplace_administer_shipping_methods',

  ];

  foreach ($configurations as $name) {

    if ($configuration = $config->getEditable($name)) {

commerce_marketplace.links.action.yml

+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@ view.commerce_marketplace_store_shipping_methods.add_page: 
  route_name: entity.commerce_shipping_method.add_form

  title: 'Add shipping method'

  appears_on:

    - view.commerce_marketpplace_administer_shipping_methods.methods_page
 
    - view.commerce_marketplace_administer_shipping_methods.methods_page

commerce_marketplace.module

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ use Drupal\commerce_marketplace\Form\MarketplaceForm; 
use Drupal\commerce_marketplace\MarketplaceEntityTypeInfo;

use Drupal\commerce_marketplace\Form\MarketplaceProductForm;

use Drupal\commerce_marketplace\Form\MarketplaceAddToCartForm;

use Drupal\commerce_marketplace\Form\MarketplaceShippingMethodForm;

use Drupal\commerce_marketplace\MarketplaceAccessControlHandler;

use Drupal\commerce_marketplace\MarketplaceEntityPermissionProvider;

use Drupal\commerce_marketplace\MarketplaceTypeAccessControlHandler;
@@ -27,8 +28,8 @@ use Drupal\commerce_marketplace\MarketplaceProductVariationAccessControlHandler; 
use Drupal\commerce_marketplace\MarketplaceProductAccessControlHandler;

use Drupal\commerce_marketplace\MarketplaceCurrencyAccessControlHandler;

use Drupal\commerce_marketplace\MarketplaceProductTypeAccessControlHandler;

use Drupal\commerce_marketplace\Plugin\views\argument_default\MarketplaceUser;

use Drupal\commerce_marketplace\MarketplaceShippingMethodAccessControlHandler;

use Drupal\commerce_marketplace\Plugin\views\argument_default\MarketplaceUser;



/**

 * Implements hook_help().
@@ -103,6 +104,8 @@ function commerce_marketplace_entity_type_alter(array &$entity_types) { 
  $entity_types['commerce_order_item_type']->setHandlerClass('list_builder', MarketplaceOrderItemTypeListBuilder::class);

  $entity_types['commerce_product_variation_type']->setHandlerClass('list_builder', MarketplaceVariationTypeListBuilder::class);

  if (isset($entity_types['commerce_shipping_method'])) {

    $entity_types['commerce_shipping_method']->setFormClass('add', MarketplaceShippingMethodForm::class);

    $entity_types['commerce_shipping_method']->setFormClass('edit', MarketplaceShippingMethodForm::class);

    $entity_types['commerce_shipping_method']->setAccessClass(MarketplaceShippingMethodAccessControlHandler::class);

  }

}

config/install/views.view.commerce_marketpplace_administer_shipping_methods.yml→config/install/views.view.commerce_marketplace_administer_shipping_methods.yml

+16 −78
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ dependencies: 
    - commerce_shipping

    - commerce_store

    - user

id: commerce_marketpplace_administer_shipping_methods

id: commerce_marketplace_administer_shipping_methods

label: 'Administer Store Shipping Methods'

module: views

description: 'Administer store shipping methods'
@@ -343,55 +343,6 @@ display: 
          entity_type: commerce_shipping_method

          entity_field: stores

          plugin_id: field

        nothing:

          id: nothing

          table: views

          field: nothing

          relationship: none

          group_type: group

          admin_label: ''

          label: Owner

          exclude: false

          alter:

            alter_text: true

            text: "{% if stores_target_id == arguments.store_id %}\r\n<h4>{{ 'You'|t }}</h4>\r\n{% else %}\r\n<h4>{{ \"Admin\"|t }}</h4>\r\n{% endif %}\r\n"

            make_link: false

            path: ''

            absolute: false

            external: false

            replace_spaces: false

            path_case: none

            trim_whitespace: false

            alt: ''

            rel: ''

            link_class: ''

            prefix: ''

            suffix: ''

            target: ''

            nl2br: false

            max_length: 0

            word_boundary: true

            ellipsis: true

            more_link: false

            more_link_text: ''

            more_link_path: ''

            strip_tags: false

            trim: false

            preserve_tags: ''

            html: false

          element_type: ''

          element_class: ''

          element_label_type: ''

          element_label_class: ''

          element_label_colon: true

          element_wrapper_type: ''

          element_wrapper_class: ''

          element_default_classes: true

          empty: ''

          hide_empty: false

          empty_zero: false

          hide_alter_empty: false

          plugin_id: custom

        name:

          id: name

          table: commerce_shipping_method_field_data
@@ -403,7 +354,7 @@ display: 
          exclude: false

          alter:

            alter_text: true

            text: "<strong><a href=\"/admin/commerce/shipping-methods/manage/{{ shipping_method_id }}/?destination=/store/{{ raw_arguments.store_id }}/shipping-methods\" >{{ name }}</a></strong>\r\n"

            text: "{% if stores_target_id == arguments.store_id %}\r\n  <strong><a href=\"/admin/commerce/shipping-methods/manage/{{ shipping_method_id }}/?destination=/store/{{ raw_arguments.store_id }}/shipping-methods\" >{{ name }}</a></strong>\r\n{% else %}\r\n  <strong>{{ name }}</strong>\r\n{% endif %}\r\n"

            make_link: false

            path: ''

            absolute: false
@@ -508,7 +459,7 @@ display: 
          click_sort_column: value

          type: boolean

          settings:

            format: yes-no

            format: enabled-disabled

            format_custom_true: ''

            format_custom_false: ''

          group_column: value
@@ -524,14 +475,14 @@ display: 
          entity_type: commerce_shipping_method

          entity_field: status

          plugin_id: field

        plugin__target_plugin_id:

          id: plugin__target_plugin_id

          table: commerce_shipping_method_field_data

          field: plugin__target_plugin_id

        conditions_target_plugin_id:

          id: conditions_target_plugin_id

          table: commerce_shipping_method__conditions

          field: conditions_target_plugin_id

          relationship: none

          group_type: group

          admin_label: ''

          label: Plugin

          label: Conditions

          exclude: false

          alter:

            alter_text: false
@@ -586,16 +537,16 @@ display: 
          separator: ', '

          field_api_classes: false

          entity_type: commerce_shipping_method

          entity_field: plugin

          entity_field: conditions

          plugin_id: field

        conditions_target_plugin_id:

          id: conditions_target_plugin_id

          table: commerce_shipping_method__conditions

          field: conditions_target_plugin_id

        operations:

          id: operations

          table: commerce_shipping_method

          field: operations

          relationship: none

          group_type: group

          admin_label: ''

          label: Conditions

          label: Operations

          exclude: false

          alter:

            alter_text: false
@@ -636,22 +587,9 @@ display: 
          hide_empty: false

          empty_zero: false

          hide_alter_empty: true

          click_sort_column: target_plugin_id

          type: commerce_plugin_item_default

          settings: {  }

          group_column: ''

          group_columns: {  }

          group_rows: true

          delta_limit: 0

          delta_offset: 0

          delta_reversed: false

          delta_first_last: false

          multi_type: separator

          separator: ', '

          field_api_classes: false

          destination: false

          entity_type: commerce_shipping_method

          entity_field: conditions

          plugin_id: field

          plugin_id: entity_operations

      filters: {  }

      sorts:

        status: