Permalink
Browse files

Aligning dev and prod code. Replacing code in branch dev with code pr…

…esent in tag 2017-12-26
  • Loading branch information...
Prodru01
Prodru01 committed Jan 6, 2018
1 parent 4ce2589 commit d771ea3e677d40993500e4682c3d8a176cdbb647
Showing 466 changed files with 4,388 additions and 5,749 deletions.
View
@@ -47,7 +47,6 @@
"drupal/age_field_formatter": "^2.0.0",
"drupal/commerce": "^2.2.0",
"drupal/commerce_paypal": "^1.0.0-beta1",
"drupal/commerce_profile_pane": "^1.0.0-alpha2",
"drupal/commerce_license": "^2.0.0-alpha2",
"drupal/ctools": "^3.0.0",
"drupal/diff": "^1.0.0-rc1",
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -12,7 +12,7 @@ dependencies:
id: drupalportugal_bartik_account_menu
theme: drupalportugal_bartik
region: sidebar_second
weight: -9
weight: -10
provider: null
plugin: 'system_menu_block:account'
settings:
@@ -1,6 +1,6 @@
uuid: c255d577-5d92-4a5c-8cfb-4db56247998b
langcode: pt-pt
status: true
status: false
dependencies:
content:
- 'block_content:basic:d8c1cc5b-4249-43c9-aa50-ac85072f8862'
@@ -12,7 +12,7 @@ dependencies:
id: drupalportugal_bartik_custom_become_member
theme: drupalportugal_bartik
region: sidebar_second
weight: -14
weight: -8
provider: null
plugin: 'block_content:d8c1cc5b-4249-43c9-aa50-ac85072f8862'
settings:
@@ -12,7 +12,7 @@ dependencies:
id: drupalportugal_bartik_custom_follow_us
theme: drupalportugal_bartik
region: sidebar_second
weight: -10
weight: -12
provider: null
plugin: 'block_content:25678aef-4f17-4688-9f8e-e5cff2cbd6e4'
settings:
@@ -9,7 +9,7 @@ dependencies:
id: drupalportugal_bartik_login
theme: drupalportugal_bartik
region: sidebar_second
weight: -8
weight: -9
provider: null
plugin: user_login_block
settings:
@@ -11,7 +11,7 @@ dependencies:
id: drupalportugal_bartik_section_association
theme: drupalportugal_bartik
region: sidebar_second
weight: -11
weight: -13
provider: null
plugin: 'system_menu_block:section-association'
settings:
@@ -11,7 +11,7 @@ dependencies:
id: drupalportugal_bartik_section_community
theme: drupalportugal_bartik
region: sidebar_second
weight: -12
weight: -14
provider: null
plugin: 'system_menu_block:section-community'
settings:
@@ -11,7 +11,7 @@ dependencies:
id: drupalportugal_bartik_section_drupal
theme: drupalportugal_bartik
region: sidebar_second
weight: -13
weight: -15
provider: null
plugin: 'system_menu_block:section-drupal'
settings:
@@ -0,0 +1,33 @@
uuid: 32907cfe-696d-436d-b9d8-c4715f2ee662
langcode: pt-pt
status: true
dependencies:
config:
- views.view.commerce_user_orders
module:
- user
- views
theme:
- drupalportugal_bartik
id: views_block__commerce_user_orders_block_1
theme: drupalportugal_bartik
region: sidebar_second
weight: -11
provider: null
plugin: 'views_block:commerce_user_orders-block_1'
settings:
id: 'views_block:commerce_user_orders-block_1'
label: ''
provider: views
label_display: visible
views_label: ''
items_per_page: '5'
context_mapping: { }
visibility:
user_role:
id: user_role
roles:
associate: associate
negate: false
context_mapping:
user: '@user.current_user_context:current_user'

This file was deleted.

Oops, something went wrong.
@@ -1,10 +1,9 @@
uuid: 3c887274-1029-4191-8231-89d493877bfa
uuid: 4f9cdd2b-139b-48ee-af9c-bdad4cb2caa7
langcode: pt-pt
status: true
dependencies:
module:
- commerce_payment
- commerce_profile_pane
_core:
default_config_hash: wwkDVBiXUqSzRifJbb71ajFBklJdNJ_DgS67IF-_qgY
id: default
@@ -36,16 +35,6 @@ configuration:
step: complete
weight: 5
order_summary:
view: null
view: commerce_checkout_order_summary
step: _sidebar
weight: 6
'profile_form:associate':
form_mode: default
display_label: 'Edit profile'
step: _disabled
weight: 8
'profile_form:member':
form_mode: default
display_label: 'Edit profile'
step: _disabled
weight: 9
@@ -1,4 +1,4 @@
uuid: ea29748e-ac9f-417e-8923-e1ede36313be
uuid: 056f9176-2423-43ab-8735-36dfd213456d
langcode: pt-pt
status: true
dependencies:
@@ -1,10 +1,10 @@
uuid: 673ea7b0-0cf0-4ad1-b8df-8a54217bc3e9
uuid: 509f7ac0-e8b5-4818-9b51-43897aca3b4f
langcode: pt-pt
status: true
dependencies: { }
label: Sócio
id: associate
label: Socios
id: socios
purchasableEntityType: commerce_product_variation
orderType: associate
orderType: socios
traits:
- commerce_license_order_item_type
@@ -1,23 +1,14 @@
uuid: 04ef0969-455c-40c2-b109-373c8c584ffe
uuid: 76c3ee9a-6217-4ba0-8684-ea05d46b5ed4
langcode: pt-pt
status: true
dependencies:
module:
- commerce_cart
- commerce_checkout
third_party_settings:
commerce_cart:
cart_form_view: commerce_cart_form
cart_block_view: commerce_cart_block
commerce_checkout:
checkout_flow: default
dependencies: { }
_core:
default_config_hash: zf7YA-OOtWhhrphbf3YOlc49POwC9rePktH9cBavEiA
label: Predefinido
id: default
workflow: order_fulfillment
workflow: order_default
traits: { }
refresh_mode: customer
refresh_frequency: 300
sendReceipt: true
receiptBcc: secretariado@drupal.pt
receiptBcc: ''
@@ -1,4 +1,4 @@
uuid: 2f7e4d0a-1c25-46b8-9160-5f038e7d2638
uuid: 89bcec07-f500-44e4-83a4-658e0481b793
langcode: pt-pt
status: true
dependencies:
@@ -10,12 +10,12 @@ third_party_settings:
cart_form_view: commerce_cart_form
cart_block_view: commerce_cart_block
commerce_checkout:
checkout_flow: associate
label: Sócio
id: associate
checkout_flow: default
label: Socios
id: socios
workflow: order_fulfillment
traits: { }
refresh_mode: customer
refresh_frequency: 300
sendReceipt: true
receiptBcc: secretariado@drupal.pt
receiptBcc: info@drupal.pt
Oops, something went wrong.

0 comments on commit d771ea3

Please sign in to comment.