Skip to content

Commit 2ddeff1

Browse files
lopes-vincentlopes-vincent
authored
Merge pull request #42 from lopes-vincent/master
Thelia 2.4 compatibility
2 parents f667fb4 + a8831f7 commit 2ddeff1

33 files changed

+14
-29953
lines changed

‎Config/config.xml

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<loops>
88
<loop name="paypal_order" class="PayPal\Loop\PayPalOrderLoop" />
9-
<loop name="paypal_order_version" class="PayPal\Loop\PayPalOrderVersionLoop" />
109
<loop name="paypal_planified_payment" class="PayPal\Loop\PayPalPlanifiedPaymentLoop" />
1110
<loop name="paypal_log" class="PayPal\Loop\PayPalLogLoop" />
1211
</loops>

‎Config/create.sql

+5-44
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ CREATE TABLE IF NOT EXISTS `paypal_cart`
7676
`created_at` DATETIME,
7777
`updated_at` DATETIME,
7878
PRIMARY KEY (`id`),
79-
INDEX `FI_paypal_cart_planified_payment_id` (`planified_payment_id`),
79+
INDEX `fi_paypal_cart_planified_payment_id` (`planified_payment_id`),
8080
CONSTRAINT `fk_paypal_cart_cart_id`
8181
FOREIGN KEY (`id`)
8282
REFERENCES `cart` (`id`)
@@ -114,9 +114,6 @@ CREATE TABLE IF NOT EXISTS `paypal_order`
114114
`planified_max_amount` DECIMAL(16,6) DEFAULT 0.000000,
115115
`created_at` DATETIME,
116116
`updated_at` DATETIME,
117-
`version` INTEGER DEFAULT 0,
118-
`version_created_at` DATETIME,
119-
`version_created_by` VARCHAR(100),
120117
PRIMARY KEY (`id`),
121118
CONSTRAINT `fk_paypal_order_order_id`
122119
FOREIGN KEY (`id`)
@@ -138,7 +135,7 @@ CREATE TABLE IF NOT EXISTS `paypal_plan`
138135
`created_at` DATETIME,
139136
`updated_at` DATETIME,
140137
PRIMARY KEY (`id`),
141-
INDEX `FI_paypal_plan_paypal_order_id` (`paypal_order_id`),
138+
INDEX `fi_paypal_plan_paypal_order_id` (`paypal_order_id`),
142139
CONSTRAINT `fk_paypal_plan_paypal_order_id`
143140
FOREIGN KEY (`paypal_order_id`)
144141
REFERENCES `paypal_order` (`id`)
@@ -163,8 +160,8 @@ CREATE TABLE IF NOT EXISTS `paypal_log`
163160
`created_at` DATETIME,
164161
`updated_at` DATETIME,
165162
PRIMARY KEY (`id`),
166-
INDEX `FI_paypal_log_customer_id` (`customer_id`),
167-
INDEX `FI_paypal_log_order_id` (`order_id`),
163+
INDEX `fi_paypal_log_customer_id` (`customer_id`),
164+
INDEX `fi_paypal_log_order_id` (`order_id`),
168165
CONSTRAINT `fk_paypal_log_customer_id`
169166
FOREIGN KEY (`customer_id`)
170167
REFERENCES `customer` (`id`)
@@ -188,47 +185,11 @@ CREATE TABLE IF NOT EXISTS `paypal_planified_payment_i18n`
188185
`title` VARCHAR(255) NOT NULL,
189186
`description` LONGTEXT,
190187
PRIMARY KEY (`id`,`locale`),
191-
CONSTRAINT `paypal_planified_payment_i18n_FK_1`
188+
CONSTRAINT `paypal_planified_payment_i18n_fk_c9dfe7`
192189
FOREIGN KEY (`id`)
193190
REFERENCES `paypal_planified_payment` (`id`)
194191
ON DELETE CASCADE
195192
) ENGINE=InnoDB;
196193

197-
-- ---------------------------------------------------------------------
198-
-- paypal_order_version
199-
-- ---------------------------------------------------------------------
200-
201-
CREATE TABLE IF NOT EXISTS `paypal_order_version`
202-
(
203-
`id` INTEGER NOT NULL,
204-
`payment_id` VARCHAR(50),
205-
`agreement_id` VARCHAR(255),
206-
`credit_card_id` VARCHAR(40),
207-
`state` VARCHAR(20),
208-
`amount` DECIMAL(16,6) DEFAULT 0.000000,
209-
`description` LONGTEXT,
210-
`payer_id` VARCHAR(255),
211-
`token` VARCHAR(255),
212-
`planified_title` VARCHAR(255) NOT NULL,
213-
`planified_description` LONGTEXT,
214-
`planified_frequency` VARCHAR(255) NOT NULL,
215-
`planified_frequency_interval` INTEGER NOT NULL,
216-
`planified_cycle` INTEGER NOT NULL,
217-
`planified_actual_cycle` INTEGER DEFAULT 0 NOT NULL,
218-
`planified_min_amount` DECIMAL(16,6) DEFAULT 0.000000,
219-
`planified_max_amount` DECIMAL(16,6) DEFAULT 0.000000,
220-
`created_at` DATETIME,
221-
`updated_at` DATETIME,
222-
`version` INTEGER DEFAULT 0 NOT NULL,
223-
`version_created_at` DATETIME,
224-
`version_created_by` VARCHAR(100),
225-
`id_version` INTEGER DEFAULT 0,
226-
PRIMARY KEY (`id`,`version`),
227-
CONSTRAINT `paypal_order_version_FK_1`
228-
FOREIGN KEY (`id`)
229-
REFERENCES `paypal_order` (`id`)
230-
ON DELETE CASCADE
231-
) ENGINE=InnoDB;
232-
233194
# This restores the fkey checks, after having unset them earlier
234195
SET FOREIGN_KEY_CHECKS = 1;

‎Config/module.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<language>en_US</language>
2121
<language>fr_FR</language>
2222
</languages>
23-
<version>3.0.5</version>
23+
<version>4.0.0</version>
2424
<authors>
2525
<author>
2626
<name>gbarral</name>
@@ -36,6 +36,6 @@
3636
<module version="&gt;0.2">HookSearch</module>
3737
</required>
3838
-->
39-
<thelia>2.2.0</thelia>
39+
<thelia>2.4.0</thelia>
4040
<stability>other</stability>
4141
</module>

‎Config/schema.xml

-4
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,6 @@
9595
<reference foreign="id" local="id" />
9696
</foreign-key>
9797
<behavior name="timestampable" />
98-
<behavior name="versionable">
99-
<parameter name="log_created_at" value="true" />
100-
<parameter name="log_created_by" value="true" />
101-
</behavior>
10298
</table>
10399

104100
<table name="paypal_plan" namespace="PayPal\Model">

‎Config/thelia.sql

+5-46
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ CREATE TABLE `paypal_cart`
8383
`created_at` DATETIME,
8484
`updated_at` DATETIME,
8585
PRIMARY KEY (`id`),
86-
INDEX `FI_paypal_cart_planified_payment_id` (`planified_payment_id`),
86+
INDEX `fi_paypal_cart_planified_payment_id` (`planified_payment_id`),
8787
CONSTRAINT `fk_paypal_cart_cart_id`
8888
FOREIGN KEY (`id`)
8989
REFERENCES `cart` (`id`)
@@ -123,9 +123,6 @@ CREATE TABLE `paypal_order`
123123
`planified_max_amount` DECIMAL(16,6) DEFAULT 0.000000,
124124
`created_at` DATETIME,
125125
`updated_at` DATETIME,
126-
`version` INTEGER DEFAULT 0,
127-
`version_created_at` DATETIME,
128-
`version_created_by` VARCHAR(100),
129126
PRIMARY KEY (`id`),
130127
CONSTRAINT `fk_paypal_order_order_id`
131128
FOREIGN KEY (`id`)
@@ -149,7 +146,7 @@ CREATE TABLE `paypal_plan`
149146
`created_at` DATETIME,
150147
`updated_at` DATETIME,
151148
PRIMARY KEY (`id`),
152-
INDEX `FI_paypal_plan_paypal_order_id` (`paypal_order_id`),
149+
INDEX `fi_paypal_plan_paypal_order_id` (`paypal_order_id`),
153150
CONSTRAINT `fk_paypal_plan_paypal_order_id`
154151
FOREIGN KEY (`paypal_order_id`)
155152
REFERENCES `paypal_order` (`id`)
@@ -176,8 +173,8 @@ CREATE TABLE `paypal_log`
176173
`created_at` DATETIME,
177174
`updated_at` DATETIME,
178175
PRIMARY KEY (`id`),
179-
INDEX `FI_paypal_log_customer_id` (`customer_id`),
180-
INDEX `FI_paypal_log_order_id` (`order_id`),
176+
INDEX `fi_paypal_log_customer_id` (`customer_id`),
177+
INDEX `fi_paypal_log_order_id` (`order_id`),
181178
CONSTRAINT `fk_paypal_log_customer_id`
182179
FOREIGN KEY (`customer_id`)
183180
REFERENCES `customer` (`id`)
@@ -203,49 +200,11 @@ CREATE TABLE `paypal_planified_payment_i18n`
203200
`title` VARCHAR(255) NOT NULL,
204201
`description` LONGTEXT,
205202
PRIMARY KEY (`id`,`locale`),
206-
CONSTRAINT `paypal_planified_payment_i18n_FK_1`
203+
CONSTRAINT `paypal_planified_payment_i18n_fk_c9dfe7`
207204
FOREIGN KEY (`id`)
208205
REFERENCES `paypal_planified_payment` (`id`)
209206
ON DELETE CASCADE
210207
) ENGINE=InnoDB;
211208

212-
-- ---------------------------------------------------------------------
213-
-- paypal_order_version
214-
-- ---------------------------------------------------------------------
215-
216-
DROP TABLE IF EXISTS `paypal_order_version`;
217-
218-
CREATE TABLE `paypal_order_version`
219-
(
220-
`id` INTEGER NOT NULL,
221-
`payment_id` VARCHAR(50),
222-
`agreement_id` VARCHAR(255),
223-
`credit_card_id` VARCHAR(40),
224-
`state` VARCHAR(20),
225-
`amount` DECIMAL(16,6) DEFAULT 0.000000,
226-
`description` LONGTEXT,
227-
`payer_id` VARCHAR(255),
228-
`token` VARCHAR(255),
229-
`planified_title` VARCHAR(255) NOT NULL,
230-
`planified_description` LONGTEXT,
231-
`planified_frequency` VARCHAR(255) NOT NULL,
232-
`planified_frequency_interval` INTEGER NOT NULL,
233-
`planified_cycle` INTEGER NOT NULL,
234-
`planified_actual_cycle` INTEGER DEFAULT 0 NOT NULL,
235-
`planified_min_amount` DECIMAL(16,6) DEFAULT 0.000000,
236-
`planified_max_amount` DECIMAL(16,6) DEFAULT 0.000000,
237-
`created_at` DATETIME,
238-
`updated_at` DATETIME,
239-
`version` INTEGER DEFAULT 0 NOT NULL,
240-
`version_created_at` DATETIME,
241-
`version_created_by` VARCHAR(100),
242-
`id_version` INTEGER DEFAULT 0,
243-
PRIMARY KEY (`id`,`version`),
244-
CONSTRAINT `paypal_order_version_FK_1`
245-
FOREIGN KEY (`id`)
246-
REFERENCES `paypal_order` (`id`)
247-
ON DELETE CASCADE
248-
) ENGINE=InnoDB;
249-
250209
# This restores the fkey checks, after having unset them earlier
251210
SET FOREIGN_KEY_CHECKS = 1;

‎Loop/PayPalOrderVersionLoop.php

-110
This file was deleted.

0 commit comments

Comments
 (0)