Skip to content

Commit d3181cc

Browse files
barryobarryo
committed
Merge branch 'nf-billing-reg-details'
2 parents a888525 + 6b17588 commit d3181cc

File tree

53 files changed

+1869
-243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1869
-243
lines changed

‎CHANGELOG.md

+118-23
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,99 @@
1-
# v3.0.13
1+
# v3.0.15
2+
3+
**NB: This is a TWO stage migration process, please follow instructions carefully!**
4+
5+
Checkout commit with specific reference:
6+
7+
git checkout da13666cbbb2fc0c105b5e69ca3f317f89465388
8+
9+
Then update schema:
10+
11+
CREATE TABLE
12+
company_registration_detail (
13+
id INT AUTO_INCREMENT NOT NULL,
14+
registeredName VARCHAR(255) DEFAULT NULL,
15+
companyNumber VARCHAR(255) DEFAULT NULL,
16+
jurisdiction VARCHAR(255) DEFAULT NULL,
17+
address1 VARCHAR(255) DEFAULT NULL,
18+
address2 VARCHAR(255) DEFAULT NULL,
19+
address3 VARCHAR(255) DEFAULT NULL,
20+
townCity VARCHAR(255) DEFAULT NULL,
21+
postcode VARCHAR(255) DEFAULT NULL,
22+
country VARCHAR(255) DEFAULT NULL,
23+
PRIMARY KEY(id)
24+
)
25+
ENGINE = InnoDB;
26+
27+
CREATE TABLE
28+
company_billing_detail (
29+
id INT AUTO_INCREMENT NOT NULL,
30+
billingContactName VARCHAR(255) DEFAULT NULL,
31+
billingAddress1 VARCHAR(255) DEFAULT NULL,
32+
billingAddress2 VARCHAR(255) DEFAULT NULL,
33+
billingTownCity VARCHAR(255) DEFAULT NULL,
34+
billingPostcode VARCHAR(255) DEFAULT NULL,
35+
billingCountry VARCHAR(255) DEFAULT NULL,
36+
billingEmail VARCHAR(255) DEFAULT NULL,
37+
billingTelephone VARCHAR(255) DEFAULT NULL,
38+
vatNumber VARCHAR(255) DEFAULT NULL,
39+
vatRate VARCHAR(255) DEFAULT NULL,
40+
PRIMARY KEY(id)
41+
)
42+
ENGINE = InnoDB;
43+
44+
ALTER TABLE cust
45+
ADD company_registered_detail_id INT DEFAULT NULL,
46+
ADD company_billing_details_id INT DEFAULT NULL,
47+
ADD peeringmacrov6 VARCHAR(255) DEFAULT NULL;
48+
49+
ALTER TABLE cust
50+
ADD CONSTRAINT FK_997B25A98386213 FOREIGN KEY (company_registered_detail_id) REFERENCES company_registration_detail (id),
51+
ADD CONSTRAINT FK_997B25A84478F0C FOREIGN KEY (company_billing_details_id) REFERENCES company_billing_detail (id);
52+
53+
CREATE INDEX IDX_997B25A98386213 ON cust (company_registered_detail_id);
54+
CREATE INDEX IDX_997B25A84478F0C ON cust (company_billing_details_id);
55+
56+
Restart memcached and run script:
57+
58+
bin/migration-scripts/billing-details.php
59+
60+
Checkout commit with specific reference:
61+
62+
git checkout cd0e2c406b28f30bccd4c3c508751b9fed324125
63+
64+
Then restart memcached and update schema again:
65+
66+
ALTER TABLE cust
67+
DROP billingContact,
68+
DROP billingAddress1,
69+
DROP billingAddress2,
70+
DROP billingCity,
71+
DROP billingCountry;
72+
73+
74+
Checkout latest commit / head:
75+
76+
git checkout v3.0.15 (or inex-live, etc)
77+
78+
79+
80+
- [HK] Set purpose at top of file (a574ebb - Barry O'Donovan - 2013-05-27)
81+
- [BF] Left required field after testing (ed1dc21 - Nerijus Barauskas - 2013-05-23)
82+
- [IM] Using new OSS_Form_Element_DatabaseDropdown (ca54926 - Nerijus Barauskas - 2013-05-23)
83+
- [BF] Making simlar names in database for consitance (798dd8e - Nerijus Barauskas - 2013-05-20)
84+
- [BF] Non existent function called (a161d6b - Nerijus Barauskas - 2013-05-20)
85+
- [IM] Updating code to user CompanyBillingDetail entity insted of customer billing fields (e5682a1 - Nerijus Barauskas - 2013-05-20)
86+
- [DB] Removing billing fields from customer table (c1f0a17 - Nerijus Barauskas - 2013-05-20)
87+
- [NF] Addig migration script for billing details (da13666 - Nerijus Barauskas - 2013-05-20)
88+
- [IM] Updating form to use company billing/registration detail entities (b947b11 - Nerijus Barauskas - 2013-05-20)
89+
- [DB] Schema and entity fixes (869442f - Nerijus Barauskas - 2013-05-20)
90+
- [DB] Rgenerating proxies (520b2f8 - Nerijus Barauskas - 2013-05-20)
91+
- [DB] Update schema (331ad46 - Barry O'Donovan - 2013-05-20)
92+
- [DB] Update schema (0efb652 - Barry O'Donovan - 2013-05-20)
93+
- [DB] Schema fix and add registered company name (1a07245 - Barry O'Donovan - 2013-05-20)
94+
95+
96+
# v3.0.14
297

398
Schema update required:
499

@@ -13,28 +108,28 @@ updated and edited in bulk.
13108

14109
See: https://github.com/inex/IXP-Manager/wiki/Switch-and-Switch-Port-Management
15110

16-
[IM] Add help messages and a help link to documentation (47e7619 - Barry O'Donovan - 2013-05-24)
17-
[IM] Default to SNMP add for switches and allow manual add from there (aabd968 - Barry O'Donovan - 2013-05-24)
18-
[IM] Better integration of different switch port pages (8e3eff8 - Barry O'Donovan - 2013-05-24)
19-
[IM] Refactor CLI SNMP actions using new entitiy functions (6a9f789 - Barry O'Donovan - 2013-05-24)
20-
[DB] [HK] Schema / generated entities clean up (5b52ee2 - Barry O'Donovan - 2013-05-24)
21-
[IM/CR] Major refactor of SNMP polling code (246308e - Barry O'Donovan - 2013-05-23)
22-
[CR] Small tweaks and fixes. (39cf69d - Barry O'Donovan - 2013-05-23)
23-
[IM] Better AJAX handling (74ed6f6 - Nerijus Barauskas - 2013-05-23)
24-
[BF] Fixing logic (4d1b02f - Nerijus Barauskas - 2013-05-23)
25-
[IM] Tidying up code (a1656cd - Nerijus Barauskas - 2013-05-22)
26-
[IM] Making single row type update as ajax (45e6bf8 - Nerijus Barauskas - 2013-05-22)
27-
[NF] True /false script for frontend (aee7f81 - Nerijus Barauskas - 2013-05-22)
28-
[IM] Updating older code to reflect new active field (4c36969 - Nerijus Barauskas - 2013-05-22)
29-
[DB] Adding active field to swichport table (c61d353 - Nerijus Barauskas - 2013-05-22)
30-
[HK] Regenerating proxies after shema changes (2055343 - Nerijus Barauskas - 2013-05-22)
31-
[BF] Wrong logic then reducing log inforamtion (f4c6104 - Nerijus Barauskas - 2013-05-21)
32-
[NF] SNMP Poll first pass (3222570 - Nerijus Barauskas - 2013-05-21)
33-
[NF] Adding view for SNMP Poll (5d223d6 - Nerijus Barauskas - 2013-05-21)
34-
[IM] Adding link to snmp-poll for switch (cde0422 - Nerijus Barauskas - 2013-05-21)
35-
[WIP] Switchport discovery by SNMP (501cb2f - Barry O'Donovan - 2013-05-20)
36-
[NF] Switch polling by SNMP (a24cab2 - Barry O'Donovan - 2013-05-20)
37-
[HK] This field was a typo and is now removed (3dd5935 - Barry O'Donovan - 2013-05-20)
111+
- [IM] Add help messages and a help link to documentation (47e7619 - Barry O'Donovan - 2013-05-24)
112+
- [IM] Default to SNMP add for switches and allow manual add from there (aabd968 - Barry O'Donovan - 2013-05-24)
113+
- [IM] Better integration of different switch port pages (8e3eff8 - Barry O'Donovan - 2013-05-24)
114+
- [IM] Refactor CLI SNMP actions using new entitiy functions (6a9f789 - Barry O'Donovan - 2013-05-24)
115+
- [DB] [HK] Schema / generated entities clean up (5b52ee2 - Barry O'Donovan - 2013-05-24)
116+
- [IM/CR] Major refactor of SNMP polling code (246308e - Barry O'Donovan - 2013-05-23)
117+
- [CR] Small tweaks and fixes. (39cf69d - Barry O'Donovan - 2013-05-23)
118+
- [IM] Better AJAX handling (74ed6f6 - Nerijus Barauskas - 2013-05-23)
119+
- [BF] Fixing logic (4d1b02f - Nerijus Barauskas - 2013-05-23)
120+
- [IM] Tidying up code (a1656cd - Nerijus Barauskas - 2013-05-22)
121+
- [IM] Making single row type update as ajax (45e6bf8 - Nerijus Barauskas - 2013-05-22)
122+
- [NF] True /false script for frontend (aee7f81 - Nerijus Barauskas - 2013-05-22)
123+
- [IM] Updating older code to reflect new active field (4c36969 - Nerijus Barauskas - 2013-05-22)
124+
- [DB] Adding active field to swichport table (c61d353 - Nerijus Barauskas - 2013-05-22)
125+
- [HK] Regenerating proxies after shema changes (2055343 - Nerijus Barauskas - 2013-05-22)
126+
- [BF] Wrong logic then reducing log inforamtion (f4c6104 - Nerijus Barauskas - 2013-05-21)
127+
- [NF] SNMP Poll first pass (3222570 - Nerijus Barauskas - 2013-05-21)
128+
- [NF] Adding view for SNMP Poll (5d223d6 - Nerijus Barauskas - 2013-05-21)
129+
- [IM] Adding link to snmp-poll for switch (cde0422 - Nerijus Barauskas - 2013-05-21)
130+
- [WIP] Switchport discovery by SNMP (501cb2f - Barry O'Donovan - 2013-05-20)
131+
- [NF] Switch polling by SNMP (a24cab2 - Barry O'Donovan - 2013-05-20)
132+
- [HK] This field was a typo and is now removed (3dd5935 - Barry O'Donovan - 2013-05-20)
38133

39134

40135
# V3.0.12

0 commit comments

Comments
 (0)