Commit bde2fa27 authored by Pedro Cambra's avatar Pedro Cambra
Browse files

Issue #3269413: Make the 2.x branch only D9 compatible

parent e3254e76
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ name: Commerce Ticketing
type: module
description: 'Provides a commerce ticket entity.'
package: Liip
core: 8.x
core_version_requirement: ^8 || ^9
core_version_requirement: ^9
dependencies:
  - commerce:commerce_cart
  - commerce:commerce_order

commerce_ticketing.install

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line
<?php

/**
 * Update commerce_ticket entity definitions.
 */
function commerce_ticketing_update_8001() {
  $definition_update_manager = \Drupal::entityDefinitionUpdateManager();
  $entity_type = $definition_update_manager->getEntityType('commerce_ticket');
  $definition_update_manager->updateEntityType($entity_type);
}
+3 −3
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@
    "description": "Commerce Ticketing is a ticketing addon for Drupal Commerce.",
    "license": "GPL-2.0+",
    "require": {
        "php": ">=7.3.0",
        "drupal/core": "^8.8 || ^9",
        "php": ">=7.4.0",
        "drupal/core": "^9",
        "drupal/commerce": "^2",
        "drupal/entity_print": "^2.4",
        "drupal/entity_print": "^2",
        "endroid/qr-code": "^4.3"
    },
    "minimum-stability": "dev"
+3 −165
Original line number Diff line number Diff line
@@ -4,162 +4,13 @@ dependencies:
  config:
    - commerce_ticketing.commerce_ticket_type.default
    - core.entity_view_mode.commerce_ticket.pdf
    - field.field.commerce_ticket.default.description
    - field.field.commerce_ticket.default.ticket_name
    - views.view.event_info_for_ticket
  module:
    - entity_print
    - layout_builder
    - text
    - views
third_party_settings:
  entity_print:
    pdf_label: 'View PDF'
  layout_builder:
    enabled: true
    allow_custom: false
    sections:
      -
        layout_id: layout_twocol_section
        layout_settings:
          label: 'Ticket Print'
          context_mapping: {  }
          column_widths: 67-33
        components:
          272e32cd-7f9c-4b47-803b-5227feea614b:
            uuid: 272e32cd-7f9c-4b47-803b-5227feea614b
            region: second
            configuration:
              id: 'field_block:commerce_ticket:default:name'
              label: Name
              label_display: '0'
              provider: layout_builder
              context_mapping:
                entity: layout_builder.entity
                view_mode: view_mode
              formatter:
                type: string
                label: hidden
                settings:
                  link_to_entity: false
                third_party_settings:
                  linked_field:
                    linked: 0
                    type: custom
                    destination:
                      field:
                        field: ''
                        custom:
                          custom: ''
                      custom: ''
                    advanced:
                      title: ''
                      target: ''
                      class: ''
                      rel: ''
                      text: ''
                    token: ''
            weight: 4
            additional: {  }
          91f5aa93-1870-49a5-b84f-dbc8b7bcc01f:
            uuid: 91f5aa93-1870-49a5-b84f-dbc8b7bcc01f
            region: second
            configuration:
              id: 'field_block:commerce_ticket:default:uid'
              label: 'Ticket Owner'
              label_display: '0'
              provider: layout_builder
              context_mapping:
                entity: layout_builder.entity
                view_mode: view_mode
              formatter:
                type: entity_reference_label
                label: hidden
                settings:
                  link: false
                third_party_settings:
                  linked_field:
                    linked: 0
                    type: custom
                    destination:
                      field:
                        field: ''
                        custom:
                          custom: ''
                      custom: ''
                    advanced:
                      title: ''
                      target: ''
                      class: ''
                      rel: ''
                      text: ''
                    token: ''
            weight: 0
            additional: {  }
          9983b657-b4e3-441c-9689-204fdd0c9dd0:
            uuid: 9983b657-b4e3-441c-9689-204fdd0c9dd0
            region: second
            configuration:
              id: 'extra_field_block:commerce_ticket:default:short_uuid'
              label_display: '0'
              context_mapping:
                entity: layout_builder.entity
            weight: 3
            additional: {  }
          4cbbbd84-a4b9-452e-91b3-72ff01e00d0d:
            uuid: 4cbbbd84-a4b9-452e-91b3-72ff01e00d0d
            region: first
            configuration:
              id: 'views_block:event_info_for_ticket-block_2'
              label: ''
              label_display: '0'
              provider: views
              context_mapping: {  }
              views_label: ''
              items_per_page: none
            weight: 0
            additional: {  }
          17857317-5783-4cc3-81b0-5032eafad26f:
            uuid: 17857317-5783-4cc3-81b0-5032eafad26f
            region: second
            configuration:
              id: 'field_block:commerce_ticket:default:qr_code'
              label: 'QR Code'
              label_display: '0'
              provider: layout_builder
              context_mapping:
                entity: layout_builder.entity
                view_mode: view_mode
              formatter:
                type: commerce_ticketing_qr_code
                label: hidden
                settings:
                  size: 250
                  margin: 10
                  font_size: 20
                  background_color: '#ffffff'
                  foreground_color: '#000000'
                  label_text_color: '#000000'
                third_party_settings:
                  linked_field:
                    linked: 0
                    type: custom
                    destination:
                      field:
                        field: ''
                        custom:
                          custom: ''
                      custom: ''
                    advanced:
                      title: ''
                      target: ''
                      class: ''
                      rel: ''
                      text: ''
                    token: ''
            weight: 2
            additional: {  }
        third_party_settings: {  }
id: commerce_ticket.default.pdf
targetEntityType: commerce_ticket
bundle: default
@@ -182,14 +33,6 @@ content:
    third_party_settings: {  }
    weight: 8
    region: content
  name:
    type: string
    label: above
    settings:
      link_to_entity: false
    third_party_settings: {  }
    weight: 5
    region: content
  order_number:
    settings: {  }
    third_party_settings: {  }
@@ -221,17 +64,12 @@ content:
    third_party_settings: {  }
    weight: 3
    region: content
  uid:
    type: entity_reference_label
    label: above
    settings:
      link: true
    third_party_settings: {  }
    weight: 6
    region: content
hidden:
  created: true
  entity_print_view_epub: true
  entity_print_view_pdf: true
  entity_print_view_word_docx: true
  name: true
  short_uuid: true
  state: true
  uid: true
+1 −10
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@

namespace Drupal\Tests\commerce_ticketing\Functional;

use Drupal\commerce_order\Entity\Order;
use Drupal\commerce_price\Price;
use Drupal\user\RoleInterface;

/**
 * Tests ticket access.
 *
@@ -16,9 +12,7 @@ class MyTicketListTest extends TicketBrowserTestBase {
  /**
   * {@inheritdoc}
   */
  public static $modules = [
    'views'
  ];
  protected static $modules = ['views'];

  /**
   * Optimistic path: User can see their own tickets.
@@ -27,8 +21,6 @@ class MyTicketListTest extends TicketBrowserTestBase {
    $customer = $this->drupalCreateUser(['view own commerce_ticket']);
    $this->drupalLogin($customer);

    //    $customerWithoutAccess = $this->drupalCreateUser(['access checkout']);

    /** @var \Drupal\commerce_order\Entity\OrderItemInterface $order_item */
    $order_item = $this->createEntity('commerce_order_item', [
      'title' => $this->randomMachineName(),
@@ -56,7 +48,6 @@ class MyTicketListTest extends TicketBrowserTestBase {
    $this->assertSession()->pageTextContains('TICKET-1');
  }


  /**
   * Pesimistic path: User can't see their own tickets.
   */
Loading