My favorites | Sign in
Project Home Downloads Wiki Issues Source
READ-ONLY: This project has been archived. For more information see this post.
Search
for
  Advanced search   Search tips   Subscriptions

Issue 138 attachment: substruct_pg.patch (48.9 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
diff --git a/plugins/substruct/app/controllers/admin/orders_controller.rb b/plugins/substruct/app/controllers/admin/orders_controller.rb
index f3bf2a9..9c8638b 100755
--- a/plugins/substruct/app/controllers/admin/orders_controller.rb
+++ b/plugins/substruct/app/controllers/admin/orders_controller.rb
@@ -121,7 +121,9 @@ class Admin::OrdersController < Admin::BaseController
#
def totals
@title = 'Sales Totals'
- sql = "SELECT DISTINCT YEAR(created_on) as year "
+ # should become model function - e.g. Order.get_totals :year
+ # sql = "SELECT DISTINCT YEAR(created_on) as year "
+ sql = "SELECT DISTINCT EXTRACT(year from created_on) as year "
sql << "FROM orders "
sql << "ORDER BY year ASC"
@year_rows = Order.find_by_sql(sql)
@@ -195,7 +197,7 @@ class Admin::OrdersController < Admin::BaseController
:all,
:conditions => [
"id NOT IN(?)",
- @order.order_line_items.collect {|i| i.item_id}.join(',')
+ @order.order_line_items.collect {|i| i.item_id}
]
)
# If this order is "finished" send them to the view page instead of the edit one...
diff --git a/plugins/substruct/app/controllers/countries_controller.rb b/plugins/substruct/app/controllers/countries_controller.rb
index f0738a9..4cef8b5 100755
--- a/plugins/substruct/app/controllers/countries_controller.rb
+++ b/plugins/substruct/app/controllers/countries_controller.rb
@@ -8,7 +8,7 @@ class CountriesController < ApplicationController
# Here we order the list by rank then by name, so, first lower ranks, then
# equal ranks ordered by name.
@countries = Country.find(:all,
- :conditions => ['is_obsolete != ?', 1],
+ :conditions => ['is_obsolete != ?', true],
:order => 'rank, name ASC')
end

diff --git a/plugins/substruct/app/controllers/questions_controller.rb b/plugins/substruct/app/controllers/questions_controller.rb
index 1e2e1dd..1ac4254 100755
--- a/plugins/substruct/app/controllers/questions_controller.rb
+++ b/plugins/substruct/app/controllers/questions_controller.rb
@@ -9,7 +9,7 @@ class QuestionsController < ApplicationController
@title = "FAQ (Frequently Asked Questions)"
@questions = Question.find(
:all,
- :conditions => "featured = 1",
+ :conditions => [ "featured = ?", true ],
:order => "-rank DESC, times_viewed DESC"
)
end
diff --git a/plugins/substruct/app/controllers/store_controller.rb b/plugins/substruct/app/controllers/store_controller.rb
index 4f272d5..d69fb48 100755
--- a/plugins/substruct/app/controllers/store_controller.rb
+++ b/plugins/substruct/app/controllers/store_controller.rb
@@ -54,7 +54,7 @@ class StoreController < ApplicationController
@title = "Search Results for: #{@search_term}"
@products = Product.paginate(
:order => 'name ASC',
- :conditions => ["(name LIKE ? OR code = ?) AND #{Product::CONDITIONS_AVAILABLE}", "%#{@search_term}%", @search_term],
+ :conditions => ["(upper(name) LIKE upper(?) OR code = ?) AND #{Product::CONDITIONS_AVAILABLE}", "%#{@search_term}%", @search_term],
:page => params[:page],
:per_page => 10
)
diff --git a/plugins/substruct/app/models/order.rb b/plugins/substruct/app/models/order.rb
index c66320b..c086787 100755
--- a/plugins/substruct/app/models/order.rb
+++ b/plugins/substruct/app/models/order.rb
@@ -134,9 +134,11 @@ class Order < ActiveRecord::Base

# CLASS METHODS =============================================================

- # Searches an order
- # Uses order number, first name, last name
+ # Searches an order by order number or first name or last name.
def self.search(search_term, count=false, limit_sql=nil)
+ order_number = -1
+ order_number = search_term if (search_term.kind_of?(Fixnum) || search_term.match(/^\s*[0-9]\s*$/))
+
if (count == true) then
sql = "SELECT COUNT(*) "
else
@@ -145,12 +147,17 @@ class Order < ActiveRecord::Base
sql << "FROM orders "
sql << "INNER JOIN order_addresses AS billing_address ON (orders.billing_address_id = billing_address.id)"
sql << "INNER JOIN order_addresses AS shipping_address ON (orders.shipping_address_id = shipping_address.id)"
- sql << "WHERE orders.order_number = ? "
- sql << "OR CONCAT(billing_address.first_name, ' ', billing_address.last_name) LIKE ? "
- sql << "OR CONCAT(shipping_address.first_name, ' ', shipping_address.last_name) LIKE ? "
- sql << "ORDER BY orders.created_on DESC "
+ sql << "WHERE (orders.order_number = :number "
+ # sql << "OR CONCAT(billing_address.first_name, ' ', billing_address.last_name) LIKE ? "
+ # sql << "OR CONCAT(shipping_address.first_name, ' ', shipping_address.last_name) LIKE ? "
+ sql << "OR upper(billing_address.first_name||' '||billing_address.last_name) LIKE upper(:term) "
+ sql << "OR upper(shipping_address.first_name||' '||shipping_address.last_name) LIKE upper(:term) "
+ sql << ")"
sql << "LIMIT #{limit_sql}" if limit_sql
- arg_arr = [sql, search_term, "%#{search_term}%", "%#{search_term}%"]
+ if (!count)
+ sql << "ORDER BY orders.created_on DESC "
+ end
+ arg_arr = [sql, { :number => order_number, :term => "%#{search_term}%" }]
if (count == true) then
count_by_sql(arg_arr)
else
@@ -202,12 +209,16 @@ class Order < ActiveRecord::Base
sql = "SELECT COUNT(*) AS number_of_sales, SUM(product_cost) AS sales_total, "
sql << "SUM(tax) AS tax, SUM(shipping_cost) AS shipping "
sql << "FROM orders "
- sql << "WHERE YEAR(created_on) = ? "
+ # sql << "WHERE YEAR(created_on) = ? "
+ sql << "WHERE EXTRACT(YEAR FROM created_on) = ? "
if i != 0 then
- sql << "AND MONTH(created_on) = ? "
+ # sql << "AND MONTH(created_on) = ? "
+ sql << "AND EXTRACT(month FROM created_on) = ? "
end
- sql << "AND (order_status_code_id = 5 OR order_status_code_id = 6 OR order_status_code_id = 7) "
- sql << "LIMIT 0,1"
+ # sql << "AND (order_status_code_id = 5 OR order_status_code_id = 6 OR order_status_code_id = 7) "
+ sql << "AND order_status_code_id IN (5,6,7)"
+ # speed optimization for mysql ?
+ # sql << "LIMIT 0,1"
if i != 0 then
months[i] = self.find_by_sql([sql, year, i])[0]
else
diff --git a/plugins/substruct/app/models/order_address.rb b/plugins/substruct/app/models/order_address.rb
index 473f0a6..b3b9a82 100755
--- a/plugins/substruct/app/models/order_address.rb
+++ b/plugins/substruct/app/models/order_address.rb
@@ -35,7 +35,8 @@ class OrderAddress < ActiveRecord::Base
# Finds the shipping address for a given OrderUser
def self.find_shipping_address_for_user(user)
find(:first,
- :conditions => ["order_user_id = ? AND is_shipping = 1", user.id])
+ :conditions => ["order_user_id = ? AND is_shipping = ?",
+ user.id, true])
end

def name
diff --git a/plugins/substruct/app/models/order_shipping_type.rb b/plugins/substruct/app/models/order_shipping_type.rb
index 6686ccf..accaae4 100755
--- a/plugins/substruct/app/models/order_shipping_type.rb
+++ b/plugins/substruct/app/models/order_shipping_type.rb
@@ -24,7 +24,7 @@ class OrderShippingType < ActiveRecord::Base
def self.get_domestic
find(
:all,
- :conditions => "is_domestic = 1",
+ :conditions => ["is_domestic = ?", true],
:order => "price ASC"
)
end
@@ -32,7 +32,7 @@ class OrderShippingType < ActiveRecord::Base
def self.get_foreign
find(
:all,
- :conditions => "is_domestic = 0",
+ :conditions => ["is_domestic = ?", false],
:order => "price ASC"
)
end
diff --git a/plugins/substruct/app/models/order_user.rb b/plugins/substruct/app/models/order_user.rb
index 6a0f373..bd83e91 100755
--- a/plugins/substruct/app/models/order_user.rb
+++ b/plugins/substruct/app/models/order_user.rb
@@ -62,7 +62,8 @@ class OrderUser < ActiveRecord::Base

if !password.blank? && user.password == password
return user
- elsif user.orders.find_by_order_number(password)
+ elsif ((password.kind_of?(Fixnum) || password.match(/^[0-9]+$/)) &&
+ user.orders.find_by_order_number(password))
return user
else
return nil
diff --git a/plugins/substruct/app/models/product.rb b/plugins/substruct/app/models/product.rb
index 21a44c4..542470c 100755
--- a/plugins/substruct/app/models/product.rb
+++ b/plugins/substruct/app/models/product.rb
@@ -2,9 +2,11 @@ class Product < Item
# Conditions that the product is in stock, or available
# and just out of stock.
CONDITIONS_AVAILABLE = %Q/
- CURRENT_DATE() >= DATE(items.date_available)
- AND items.is_discontinued = 0
- OR (items.is_discontinued = 1 AND (items.quantity > 0 OR items.variation_quantity > 0))
+ (CURRENT_DATE >= date_trunc('day', items.date_available)
+ AND (items.is_discontinued = false
+ OR (items.is_discontinued = true
+ AND (items.quantity > 0 OR items.variation_quantity > 0))
+ ))
/

has_many :product_images, :dependent => :destroy
@@ -24,6 +26,7 @@ class Product < Item
:join_table => 'related_products',
:association_foreign_key => 'related_id',
:foreign_key => 'product_id',
+ :order => 'name',
:after_add => :add_return_relation,
:after_remove => :remove_return_relation

@@ -57,13 +60,13 @@ class Product < Item
end
sql << "FROM items "
sql << "WHERE ("
- sql << " name LIKE ? "
- sql << " OR items.description LIKE ? "
- sql << " OR items.code LIKE ? "
+ sql << " upper(name) LIKE upper(:term)"
+ sql << " OR upper(items.description) LIKE upper(:term)"
+ sql << " OR upper(items.code) LIKE upper(:term)"
sql << ") AND items.type = 'Product' "
sql << "ORDER BY date_available DESC "
sql << "LIMIT #{limit_sql}" if limit_sql
- arg_arr = [sql, "%#{search_term}%", "%#{search_term}%", "%#{search_term}%"]
+ arg_arr = [sql, { :term => "%#{search_term}%" }]
if (count == true) then
count_by_sql(arg_arr)
else
@@ -79,10 +82,18 @@ class Product < Item
def self.find_by_tags(tag_ids, find_available=false, order_by="items.date_available DESC")
sql = "SELECT * "
sql << "FROM items "
- sql << "JOIN products_tags on items.id = products_tags.product_id "
- sql << "WHERE products_tags.tag_id IN (#{tag_ids.join(",")}) "
- sql << "AND #{CONDITIONS_AVAILABLE}" if find_available==true
- sql << "GROUP BY items.id HAVING COUNT(*)=#{tag_ids.length} "
+ if self.connection.adapter_name == "MySQL"
+ sql << " JOIN products_tags on items.id = products_tags.product_id "
+ sql << " WHERE products_tags.tag_id IN (#{tag_ids.join(",")}) "
+ sql << " GROUP BY items.id HAVING COUNT(*)=#{tag_ids.length} "
+ else
+ sql << " WHERE #{tag_ids.length} = ("
+ sql << " SELECT count(*) FROM products_tags"
+ sql << " WHERE products_tags.product_id = items.id"
+ sql << " AND products_tags.tag_id IN (#{tag_ids.join(",")})"
+ sql << " )"
+ end
+ sql << " AND #{CONDITIONS_AVAILABLE}" if find_available==true
sql << "ORDER BY #{order_by};"
find_by_sql(sql)
end
@@ -141,10 +152,9 @@ class Product < Item
# Is this product new?
#
def is_new?
- @cached_is_new ||=
- begin
- self.date_available >= 2.weeks.ago
- end
+ # better to use date as datatype!
+ # "new" condition should be configurable!
+ @cached_is_new ||= self.date_available.to_date >= 2.weeks.ago.to_date
end

# Is this product on sale?
diff --git a/plugins/substruct/app/models/promotion.rb b/plugins/substruct/app/models/promotion.rb
index 3576b54..1dea9a7 100644
--- a/plugins/substruct/app/models/promotion.rb
+++ b/plugins/substruct/app/models/promotion.rb
@@ -59,7 +59,7 @@ class Promotion < ActiveRecord::Base
def self.any_active?
!Promotion.find(
:first,
- :conditions => "NOW() BETWEEN start AND end"
+ :conditions => "NOW() BETWEEN start AND \"end\""
).nil?
end

diff --git a/plugins/substruct/db/bootstrap/countries.yml b/plugins/substruct/db/bootstrap/countries.yml
index 08a5579..d6d37e4 100644
--- a/plugins/substruct/db/bootstrap/countries.yml
+++ b/plugins/substruct/db/bootstrap/countries.yml
@@ -6,1474 +6,1474 @@ AF:
code: AF
name: Afghanistan
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AX:
code: AX
name: Ã…land Islands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AL:
code: AL
name: Albania
rank: 10
- is_obsolete: 0
+ is_obsolete: false

DZ:
code: DZ
name: Algeria
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AS:
code: AS
name: American Samoa
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AD:
code: AD
name: Andorra
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AO:
code: AO
name: Angola
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AI:
code: AI
name: Anguilla
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AQ:
code: AQ
name: Antarctica
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AG:
code: AG
name: Antigua and Barbuda
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AR:
code: AR
name: Argentina
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AM:
code: AM
name: Armenia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AW:
code: AW
name: Aruba
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AU:
code: AU
name: Australia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AT:
code: AT
name: Austria
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AZ:
code: AZ
name: Azerbaijan
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BS:
code: BS
name: Bahamas
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BH:
code: BH
name: Bahrain
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BD:
code: BD
name: Bangladesh
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BB:
code: BB
name: Barbados
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BY:
code: BY
name: Belarus
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BE:
code: BE
name: Belgium
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BZ:
code: BZ
name: Belize
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BJ:
code: BJ
name: Benin
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BM:
code: BM
name: Bermuda
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BT:
code: BT
name: Bhutan
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BO:
code: BO
name: Bolivia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BA:
code: BA
name: Bosnia and Herzegovina
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BW:
code: BW
name: Botswana
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BV:
code: BV
name: Bouvet Island
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BR:
code: BR
name: Brazil
rank: 10
- is_obsolete: 0
+ is_obsolete: false

IO:
code: IO
name: British Indian Ocean Territory
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BN:
code: BN
name: Brunei Darussalam
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BG:
code: BG
name: Bulgaria
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BF:
code: BF
name: Burkina Faso
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BI:
code: BI
name: Burundi
rank: 10
- is_obsolete: 0
+ is_obsolete: false

KH:
code: KH
name: Cambodia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CM:
code: CM
name: Cameroon
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CA:
code: CA
name: Canada
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CV:
code: CV
name: Cape Verde
rank: 10
- is_obsolete: 0
+ is_obsolete: false

KY:
code: KY
name: Cayman Islands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CF:
code: CF
name: Central African Republic
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TD:
code: TD
name: Chad
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CL:
code: CL
name: Chile
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CN:
code: CN
name: China
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CX:
code: CX
name: Christmas Island
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CC:
code: CC
name: Cocos (Keeling) Islands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CO:
code: CO
name: Colombia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

KM:
code: KM
name: Comoros
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CD:
code: CD
name: Congo, Democratic Republic of the
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CG:
code: CG
name: Congo, Republic of the
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CK:
code: CK
name: Cook Islands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CR:
code: CR
name: Costa Rica
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CI:
code: CI
name: Côte d'Ivoire
rank: 10
- is_obsolete: 0
+ is_obsolete: false

HR:
code: HR
name: Croatia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CU:
code: CU
name: Cuba
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CY:
code: CY
name: Cyprus
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CZ:
code: CZ
name: Czech Republic
rank: 10
- is_obsolete: 0
+ is_obsolete: false

DK:
code: DK
name: Denmark
rank: 10
- is_obsolete: 0
+ is_obsolete: false

DJ:
code: DJ
name: Djibouti
rank: 10
- is_obsolete: 0
+ is_obsolete: false

DM:
code: DM
name: Dominica
rank: 10
- is_obsolete: 0
+ is_obsolete: false

DO:
code: DO
name: Dominican Republic
rank: 10
- is_obsolete: 0
+ is_obsolete: false

EC:
code: EC
name: Ecuador
rank: 10
- is_obsolete: 0
+ is_obsolete: false

EG:
code: EG
name: Egypt
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SV:
code: SV
name: El Salvador
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GQ:
code: GQ
name: Equatorial Guinea
rank: 10
- is_obsolete: 0
+ is_obsolete: false

ER:
code: ER
name: Eritrea
rank: 10
- is_obsolete: 0
+ is_obsolete: false

EE:
code: EE
name: Estonia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

ET:
code: ET
name: Ethiopia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

FK:
code: FK
name: Falkland Islands (Malvinas)
rank: 10
- is_obsolete: 0
+ is_obsolete: false

FO:
code: FO
name: Faroe Islands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

FJ:
code: FJ
name: Fiji
rank: 10
- is_obsolete: 0
+ is_obsolete: false

FI:
code: FI
name: Finland
rank: 10
- is_obsolete: 0
+ is_obsolete: false

FR:
code: FR
name: France
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GF:
code: GF
name: French Guiana
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PF:
code: PF
name: French Polynesia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TF:
code: TF
name: French Southern Territories
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GA:
code: GA
name: Gabon
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GM:
code: GM
name: Gambia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GE:
code: GE
name: Georgia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

DE:
code: DE
name: Germany
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GH:
code: GH
name: Ghana
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GI:
code: GI
name: Gibraltar
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GR:
code: GR
name: Greece
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GL:
code: GL
name: Greenland
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GD:
code: GD
name: Grenada
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GP:
code: GP
name: Guadeloupe
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GU:
code: GU
name: Guam
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GT:
code: GT
name: Guatemala
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GG:
code: GG
name: Guernsey
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GN:
code: GN
name: Guinea
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GW:
code: GW
name: Guinea-Bissau
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GY:
code: GY
name: Guyana
rank: 10
- is_obsolete: 0
+ is_obsolete: false

HT:
code: HT
name: Haiti
rank: 10
- is_obsolete: 0
+ is_obsolete: false

HM:
code: HM
name: Heard Island and McDonald Islands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

HN:
code: HN
name: Honduras
rank: 10
- is_obsolete: 0
+ is_obsolete: false

HK:
code: HK
name: Hong Kong
rank: 10
- is_obsolete: 0
+ is_obsolete: false

HU:
code: HU
name: Hungary
rank: 10
- is_obsolete: 0
+ is_obsolete: false

IS:
code: IS
name: Iceland
rank: 10
- is_obsolete: 0
+ is_obsolete: false

IN:
code: IN
name: India
rank: 10
- is_obsolete: 0
+ is_obsolete: false

ID:
code: ID
name: Indonesia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

IR:
code: IR
name: Iran, Islamic Republic of
rank: 10
- is_obsolete: 0
+ is_obsolete: false

IQ:
code: IQ
name: Iraq
rank: 10
- is_obsolete: 0
+ is_obsolete: false

IE:
code: IE
name: Ireland
rank: 10
- is_obsolete: 0
+ is_obsolete: false

IM:
code: IM
name: Isle of Man
rank: 10
- is_obsolete: 0
+ is_obsolete: false

IL:
code: IL
name: Israel
rank: 10
- is_obsolete: 0
+ is_obsolete: false

IT:
code: IT
name: Italy
rank: 10
- is_obsolete: 0
+ is_obsolete: false

JM:
code: JM
name: Jamaica
rank: 10
- is_obsolete: 0
+ is_obsolete: false

JP:
code: JP
name: Japan
rank: 10
- is_obsolete: 0
+ is_obsolete: false

JE:
code: JE
name: Jersey
rank: 10
- is_obsolete: 0
+ is_obsolete: false

JO:
code: JO
name: Jordan
rank: 10
- is_obsolete: 0
+ is_obsolete: false

KZ:
code: KZ
name: Kazakhstan
rank: 10
- is_obsolete: 0
+ is_obsolete: false

KE:
code: KE
name: Kenya
rank: 10
- is_obsolete: 0
+ is_obsolete: false

KI:
code: KI
name: Kiribati
rank: 10
- is_obsolete: 0
+ is_obsolete: false

KP:
code: KP
name: Korea, North
rank: 10
- is_obsolete: 0
+ is_obsolete: false

KR:
code: KR
name: Korea, South
rank: 10
- is_obsolete: 0
+ is_obsolete: false

KW:
code: KW
name: Kuwait
rank: 10
- is_obsolete: 0
+ is_obsolete: false

KG:
code: KG
name: Kyrgyzstan
rank: 10
- is_obsolete: 0
+ is_obsolete: false

LA:
code: LA
name: Lao People's Democratic Republic
rank: 10
- is_obsolete: 0
+ is_obsolete: false

LV:
code: LV
name: Latvia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

LB:
code: LB
name: Lebanon
rank: 10
- is_obsolete: 0
+ is_obsolete: false

LS:
code: LS
name: Lesotho
rank: 10
- is_obsolete: 0
+ is_obsolete: false

LR:
code: LR
name: Liberia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

LY:
code: LY
name: Libyan Arab Jamahiriya
rank: 10
- is_obsolete: 0
+ is_obsolete: false

LI:
code: LI
name: Liechtenstein
rank: 10
- is_obsolete: 0
+ is_obsolete: false

LT:
code: LT
name: Lithuania
rank: 10
- is_obsolete: 0
+ is_obsolete: false

LU:
code: LU
name: Luxembourg
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MO:
code: MO
name: Macao
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MK:
code: MK
name: Macedonia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MG:
code: MG
name: Madagascar
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MW:
code: MW
name: Malawi
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MY:
code: MY
name: Malaysia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MV:
code: MV
name: Maldives
rank: 10
- is_obsolete: 0
+ is_obsolete: false

ML:
code: ML
name: Mali
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MT:
code: MT
name: Malta
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MH:
code: MH
name: Marshall Islands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MQ:
code: MQ
name: Martinique
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MR:
code: MR
name: Mauritania
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MU:
code: MU
name: Mauritius
rank: 10
- is_obsolete: 0
+ is_obsolete: false

YT:
code: YT
name: Mayotte
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MX:
code: MX
name: Mexico
rank: 10
- is_obsolete: 0
+ is_obsolete: false

FM:
code: FM
name: Micronesia, Federated States of
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MD:
code: MD
name: Moldova
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MC:
code: MC
name: Monaco
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MN:
code: MN
name: Mongolia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

ME:
code: ME
name: Montenegro
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MS:
code: MS
name: Montserrat
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MA:
code: MA
name: Morocco
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MZ:
code: MZ
name: Mozambique
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MM:
code: MM
name: Myanmar
rank: 10
- is_obsolete: 0
+ is_obsolete: false

NA:
code: NA
name: Namibia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

NR:
code: NR
name: Nauru
rank: 10
- is_obsolete: 0
+ is_obsolete: false

NP:
code: NP
name: Nepal
rank: 10
- is_obsolete: 0
+ is_obsolete: false

NL:
code: NL
name: Netherlands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AN:
code: AN
name: Netherlands Antilles
rank: 10
- is_obsolete: 0
+ is_obsolete: false

NC:
code: NC
name: New Caledonia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

NZ:
code: NZ
name: New Zealand
rank: 10
- is_obsolete: 0
+ is_obsolete: false

NI:
code: NI
name: Nicaragua
rank: 10
- is_obsolete: 0
+ is_obsolete: false

NE:
code: NE
name: Niger
rank: 10
- is_obsolete: 0
+ is_obsolete: false

NG:
code: NG
name: Nigeria
rank: 10
- is_obsolete: 0
+ is_obsolete: false

NU:
code: NU
name: Niue
rank: 10
- is_obsolete: 0
+ is_obsolete: false

NF:
code: NF
name: Norfolk Island
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MP:
code: MP
name: Northern Mariana Islands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

NO:
code: NO
name: Norway
rank: 10
- is_obsolete: 0
+ is_obsolete: false

OM:
code: OM
name: Oman
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PK:
code: PK
name: Pakistan
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PW:
code: PW
name: Palau
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PS:
code: PS
name: Palestinian Territory, Occupied
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PA:
code: PA
name: Panama
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PG:
code: PG
name: Papua New Guinea
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PY:
code: PY
name: Paraguay
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PE:
code: PE
name: Peru
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PH:
code: PH
name: Philippines
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PN:
code: PN
name: Pitcairn
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PL:
code: PL
name: Poland
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PT:
code: PT
name: Portugal
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PR:
code: PR
name: Puerto Rico
rank: 10
- is_obsolete: 0
+ is_obsolete: false

QA:
code: QA
name: Qatar
rank: 10
- is_obsolete: 0
+ is_obsolete: false

RE:
code: RE
name: Réunion
rank: 10
- is_obsolete: 0
+ is_obsolete: false

RO:
code: RO
name: Romania
rank: 10
- is_obsolete: 0
+ is_obsolete: false

RU:
code: RU
name: Russian Federation
rank: 10
- is_obsolete: 0
+ is_obsolete: false

RW:
code: RW
name: Rwanda
rank: 10
- is_obsolete: 0
+ is_obsolete: false

BL:
code: BL
name: Saint Barthélemy
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SH:
code: SH
name: Saint Helena
rank: 10
- is_obsolete: 0
+ is_obsolete: false

KN:
code: KN
name: Saint Kitts and Nevis
rank: 10
- is_obsolete: 0
+ is_obsolete: false

LC:
code: LC
name: Saint Lucia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

MF:
code: MF
name: Saint Martin
rank: 10
- is_obsolete: 0
+ is_obsolete: false

PM:
code: PM
name: Saint Pierre and Miquelon
rank: 10
- is_obsolete: 0
+ is_obsolete: false

VC:
code: VC
name: Saint Vincent and the Grenadines
rank: 10
- is_obsolete: 0
+ is_obsolete: false

WS:
code: WS
name: Samoa
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SM:
code: SM
name: San Marino
rank: 10
- is_obsolete: 0
+ is_obsolete: false

ST:
code: ST
name: Sao Tome and Principe
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SA:
code: SA
name: Saudi Arabia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SN:
code: SN
name: Senegal
rank: 10
- is_obsolete: 0
+ is_obsolete: false

RS:
code: RS
name: Serbia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SC:
code: SC
name: Seychelles
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SL:
code: SL
name: Sierra Leone
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SG:
code: SG
name: Singapore
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SK:
code: SK
name: Slovakia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SI:
code: SI
name: Slovenia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SB:
code: SB
name: Solomon Islands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SO:
code: SO
name: Somalia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

ZA:
code: ZA
name: South Africa
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GS:
code: GS
name: South Georgia and the South Sandwich Islands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

ES:
code: ES
name: Spain
rank: 10
- is_obsolete: 0
+ is_obsolete: false

LK:
code: LK
name: Sri Lanka
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SD:
code: SD
name: Sudan
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SR:
code: SR
name: Suriname
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SJ:
code: SJ
name: Svalbard
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SZ:
code: SZ
name: Swaziland
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SE:
code: SE
name: Sweden
rank: 10
- is_obsolete: 0
+ is_obsolete: false

CH:
code: CH
name: Switzerland
rank: 10
- is_obsolete: 0
+ is_obsolete: false

SY:
code: SY
name: Syrian Arab Republic
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TW:
code: TW
name: Taiwan
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TJ:
code: TJ
name: Tajikistan
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TZ:
code: TZ
name: Tanzania
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TH:
code: TH
name: Thailand
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TL:
code: TL
name: Timor-Leste
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TG:
code: TG
name: Togo
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TK:
code: TK
name: Tokelau
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TO:
code: TO
name: Tonga
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TT:
code: TT
name: Trinidad and Tobago
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TN:
code: TN
name: Tunisia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TR:
code: TR
name: Turkey
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TM:
code: TM
name: Turkmenistan
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TC:
code: TC
name: Turks and Caicos Islands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

TV:
code: TV
name: Tuvalu
rank: 10
- is_obsolete: 0
+ is_obsolete: false

UG:
code: UG
name: Uganda
rank: 10
- is_obsolete: 0
+ is_obsolete: false

UA:
code: UA
name: Ukraine
rank: 10
- is_obsolete: 0
+ is_obsolete: false

AE:
code: AE
name: United Arab Emirates
rank: 10
- is_obsolete: 0
+ is_obsolete: false

GB:
code: GB
name: United Kingdom
rank: 10
- is_obsolete: 0
+ is_obsolete: false

UM:
code: UM
name: United States Minor Outlying Islands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

US:
code: US
name: United States of America
rank: 0
- is_obsolete: 0
+ is_obsolete: false

UY:
code: UY
name: Uruguay
rank: 10
- is_obsolete: 0
+ is_obsolete: false

UZ:
code: UZ
name: Uzbekistan
rank: 10
- is_obsolete: 0
+ is_obsolete: false

VU:
code: VU
name: Vanuatu
rank: 10
- is_obsolete: 0
+ is_obsolete: false

VA:
code: VA
name: Vatican City State
rank: 10
- is_obsolete: 0
+ is_obsolete: false

VE:
code: VE
name: Venezuela
rank: 10
- is_obsolete: 0
+ is_obsolete: false

VN:
code: VN
name: Viet Nam
rank: 10
- is_obsolete: 0
+ is_obsolete: false

VG:
code: VG
name: Virgin Islands, British
rank: 10
- is_obsolete: 0
+ is_obsolete: false

VI:
code: VI
name: Virgin Islands, U.S.
rank: 10
- is_obsolete: 0
+ is_obsolete: false

WF:
code: WF
name: Wallis and Futuna Islands
rank: 10
- is_obsolete: 0
+ is_obsolete: false

EH:
code: EH
name: Western Sahara
rank: 10
- is_obsolete: 0
+ is_obsolete: false

YE:
code: YE
name: Yemen
rank: 10
- is_obsolete: 0
+ is_obsolete: false

ZM:
code: ZM
name: Zambia
rank: 10
- is_obsolete: 0
+ is_obsolete: false

ZW:
code: ZW
name: Zimbabwe
rank: 10
- is_obsolete: 0
+ is_obsolete: false
diff --git a/plugins/substruct/db/schema.rb b/plugins/substruct/db/schema.rb
index ad9186d..c7a3cb5 100755
--- a/plugins/substruct/db/schema.rb
+++ b/plugins/substruct/db/schema.rb
@@ -24,15 +24,15 @@ ActiveRecord::Schema.define(:version => 0) do
t.string "type", :limit => 50, :default => "", :null => false
end

- add_index "content_nodes", ["name"], :name => "name"
- add_index "content_nodes", ["type", "id"], :name => "type"
+ add_index "content_nodes", ["name"]
+ add_index "content_nodes", ["type", "id"]

create_table "content_nodes_sections", :id => false, :force => true do |t|
t.integer "content_node_id", :limit => 11, :default => 0, :null => false
t.integer "section_id", :limit => 11, :default => 0, :null => false
end

- add_index "content_nodes_sections", ["content_node_id", "section_id"], :name => "default"
+ add_index "content_nodes_sections", ["content_node_id", "section_id"], :name => "index_content_nodes_sctions"

create_table "countries", :force => true do |t|
t.string "name", :limit => 100, :default => "", :null => false
@@ -46,7 +46,7 @@ ActiveRecord::Schema.define(:version => 0) do
t.string "name", :limit => 100, :default => "", :null => false
t.text "description"
t.float "price", :default => 0.0, :null => false
- t.datetime "date_available", :null => false
+ t.date "date_available", :null => false
t.integer "quantity", :limit => 11, :default => 0, :null => false
t.float "size_width", :default => 0.0, :null => false
t.float "size_height", :default => 0.0, :null => false
@@ -58,10 +58,13 @@ ActiveRecord::Schema.define(:version => 0) do
t.integer "variation_quantity", :limit => 11, :default => 0, :null => false
end

- add_index "items", ["quantity", "is_discontinued", "variation_quantity"], :name => "published"
- add_index "items", ["product_id", "type"], :name => "variation"
- add_index "items", ["date_available", "is_discontinued", "quantity", "variation_quantity", "type"], :name => "tag_view"
- add_index "items", ["name", "code", "is_discontinued", "date_available", "quantity", "variation_quantity", "type"], :name => "search"
+ add_index "items", ["quantity", "is_discontinued", "variation_quantity"],
+ :name=>"index_items_quantity"
+ add_index "items", ["product_id", "type"]
+ add_index "items", ["date_available", "is_discontinued", "quantity", "variation_quantity", "type"],
+ :name=>"index_items_availability"
+ add_index "items", ["name", "code", "is_discontinued", "date_available", "quantity", "variation_quantity", "type"],
+ :name=>"index_items_name"

create_table "order_account_types", :force => true do |t|
t.string "name", :limit => 30, :default => "", :null => false
@@ -79,7 +82,8 @@ ActiveRecord::Schema.define(:version => 0) do
t.string "bank_name", :limit => 50
end

- add_index "order_accounts", ["order_user_id", "order_account_type_id"], :name => "ids"
+ add_index "order_accounts", ["order_user_id", "order_account_type_id"],
+ :name=>"index_order_accounts"

create_table "order_addresses", :force => true do |t|
t.integer "order_user_id", :limit => 11, :default => 0, :null => false
@@ -91,10 +95,11 @@ ActiveRecord::Schema.define(:version => 0) do
t.string "state", :limit => 30
t.string "zip", :limit => 10
t.integer "country_id", :limit => 11, :default => 0, :null => false
+ t.boolean "is_shipping", :default => false, :null => false
end

- add_index "order_addresses", ["first_name", "last_name"], :name => "name"
- add_index "order_addresses", ["country_id", "order_user_id"], :name => "countries"
+ add_index "order_addresses", ["first_name", "last_name"]
+ add_index "order_addresses", ["country_id", "order_user_id"]

create_table "order_line_items", :force => true do |t|
t.integer "item_id", :limit => 11
@@ -122,7 +127,7 @@ ActiveRecord::Schema.define(:version => 0) do
t.string "name", :limit => 30, :default => "", :null => false
end

- add_index "order_status_codes", ["name"], :name => "name"
+ add_index "order_status_codes", ["name"]

create_table "order_users", :force => true do |t|
t.string "username", :limit => 50
@@ -133,7 +138,7 @@ ActiveRecord::Schema.define(:version => 0) do
t.string "last_name", :limit => 50, :default => "", :null => false
end

- add_index "order_users", ["email_address"], :name => "email"
+ add_index "order_users", ["email_address"]

create_table "orders", :force => true do |t|
t.integer "order_number", :limit => 11, :default => 0, :null => false
@@ -154,9 +159,9 @@ ActiveRecord::Schema.define(:version => 0) do
t.integer "order_account_id", :limit => 11, :default => 0, :null => false
end

- add_index "orders", ["order_number"], :name => "order_number"
- add_index "orders", ["order_user_id"], :name => "order_user_id"
- add_index "orders", ["order_status_code_id"], :name => "status"
+ add_index "orders", ["order_number"]
+ add_index "orders", ["order_user_id"]
+ add_index "orders", ["order_status_code_id"]

create_table "plugin_schema_migrations", :id => false, :force => true do |t|
t.string "plugin_name"
@@ -168,7 +173,7 @@ ActiveRecord::Schema.define(:version => 0) do
t.string "value", :default => ""
end

- add_index "preferences", ["name"], :name => "namevalue"
+ add_index "preferences", ["name"]

create_table "product_downloads", :force => true do |t|
t.integer "download_id", :limit => 11, :default => 0, :null => false
@@ -176,8 +181,8 @@ ActiveRecord::Schema.define(:version => 0) do
t.integer "rank", :limit => 11
end

- add_index "product_downloads", ["product_id"], :name => "pid"
- add_index "product_downloads", ["download_id"], :name => "did"
+ add_index "product_downloads", ["product_id"]
+ add_index "product_downloads", ["download_id"]

create_table "product_images", :force => true do |t|
t.integer "image_id", :limit => 11, :default => 0, :null => false
@@ -185,14 +190,14 @@ ActiveRecord::Schema.define(:version => 0) do
t.integer "rank", :limit => 11
end

- add_index "product_images", ["product_id", "image_id"], :name => "main"
+ add_index "product_images", ["product_id", "image_id"]

create_table "products_tags", :id => false, :force => true do |t|
t.integer "product_id", :limit => 11, :default => 0, :null => false
t.integer "tag_id", :limit => 11, :default => 0, :null => false
end

- add_index "products_tags", ["product_id", "tag_id"], :name => "product_tags"
+ add_index "products_tags", ["product_id", "tag_id"]

create_table "promotions", :force => true do |t|
t.string "code", :limit => 15, :default => "", :null => false
@@ -222,7 +227,8 @@ ActiveRecord::Schema.define(:version => 0) do
t.integer "related_id", :limit => 11, :default => 0, :null => false
end

- add_index "related_products", ["product_id", "related_id"], :name => "related_products"
+ add_index "related_products", ["product_id", "related_id"],
+ :name=>"index_related_products"

create_table "rights", :force => true do |t|
t.string "name"
@@ -258,7 +264,7 @@ ActiveRecord::Schema.define(:version => 0) do
t.datetime "created_at"
end

- add_index "sessions", ["sessid"], :name => "session_index"
+ add_index "sessions", ["sessid"]

create_table "tags", :force => true do |t|
t.string "name", :limit => 100, :default => "", :null => false
@@ -266,7 +272,7 @@ ActiveRecord::Schema.define(:version => 0) do
t.integer "parent_id", :limit => 11, :default => 0, :null => false
end

- add_index "tags", ["name"], :name => "name"
+ add_index "tags", ["name"]

create_table "user_uploads", :force => true do |t|
t.string "filename"
@@ -280,14 +286,14 @@ ActiveRecord::Schema.define(:version => 0) do
t.integer "size", :limit => 11
end

- add_index "user_uploads", ["created_on", "type"], :name => "creation"
+ add_index "user_uploads", ["created_on", "type"]

create_table "users", :force => true do |t|
t.string "login", :limit => 50, :default => "", :null => false
t.string "password", :limit => 40
end

- add_index "users", ["login", "password"], :name => "login"
+ add_index "users", ["login", "password"]

create_table "wishlist_items", :force => true do |t|
t.integer "order_user_id", :limit => 11, :default => 0, :null => false
@@ -295,7 +301,7 @@ ActiveRecord::Schema.define(:version => 0) do
t.datetime "created_on"
end

- add_index "wishlist_items", ["order_user_id"], :name => "user"
- add_index "wishlist_items", ["item_id"], :name => "item"
+ add_index "wishlist_items", ["order_user_id"]
+ add_index "wishlist_items", ["item_id"]

end
diff --git a/plugins/substruct/test/fixtures/items.yml b/plugins/substruct/test/fixtures/items.yml
index c5590fa..288a124 100755
--- a/plugins/substruct/test/fixtures/items.yml
+++ b/plugins/substruct/test/fixtures/items.yml
@@ -11,7 +11,7 @@ uranium_portion:
size_depth: 20
weight: 200.87
type: Product
- is_discontinued: 0
+ is_discontinued: false
variation_quantity: 0
related_products: lightsaber, holy_grenade
tags: weapons, mass_destruction, weird
@@ -28,7 +28,7 @@ lightsaber:
size_depth: 2
weight: 1.45
type: Product
- is_discontinued: 0
+ is_discontinued: false
variation_quantity: 15
related_products: uranium_portion, holy_grenade
tags: weapons
@@ -72,7 +72,7 @@ holy_grenade:
size_depth: 5
weight: 0.87
type: Product
- is_discontinued: 0
+ is_discontinued: false
variation_quantity: 0
related_products: uranium_portion, lightsaber
tags: weapons
@@ -91,7 +91,7 @@ chinchilla_coat:
size_depth: 3
weight: 4.45
type: Product
- is_discontinued: 0
+ is_discontinued: false
variation_quantity: 9
tags: fluffy

@@ -128,7 +128,7 @@ towel:
size_depth: 0.01
weight: 0.45
type: Product
- is_discontinued: 0
+ is_discontinued: false
variation_quantity: 0
tags: weapons, weird, on_sale

@@ -147,7 +147,7 @@ the_stuff:
weight: 1.52
type: Product
product_id: 0
- is_discontinued: 0
+ is_discontinued: false
variation_quantity: 1034

small_stuff:
diff --git a/plugins/substruct/test/fixtures/order_shipping_types.yml b/plugins/substruct/test/fixtures/order_shipping_types.yml
index bba5ab2..537acb5 100755
--- a/plugins/substruct/test/fixtures/order_shipping_types.yml
+++ b/plugins/substruct/test/fixtures/order_shipping_types.yml
@@ -1,17 +1,17 @@
ups_xp_critical:
code: UPX
name: UPS Express Critical (USA Only)
- is_domestic: 1
+ is_domestic: true
price: 30.00

ups_ground:
code: UPG
name: UPS Ground (USA Only)
- is_domestic: 1
+ is_domestic: true
price: 14.00

ups_worldwide:
code: UPW
name: UPS Worldwide Expedited (International Only)
- is_domestic: 0
+ is_domestic: false
price: 50.00
diff --git a/plugins/substruct/test/fixtures/questions.yml b/plugins/substruct/test/fixtures/questions.yml
index d35cea7..86c654c 100755
--- a/plugins/substruct/test/fixtures/questions.yml
+++ b/plugins/substruct/test/fixtures/questions.yml
@@ -3,4 +3,4 @@ about_stuff:
long_question: "I eated a cup of The Stuff and I'm feeling weird, what's happening?"
email_address: "somebody@somewhere.com"
answer: " "
- featured: 1
+ featured: true
diff --git a/plugins/substruct/test/functional/store_controller_test.rb b/plugins/substruct/test/functional/store_controller_test.rb
index 6cb3192..1a42c21 100644
--- a/plugins/substruct/test/functional/store_controller_test.rb
+++ b/plugins/substruct/test/functional/store_controller_test.rb
@@ -43,8 +43,8 @@ class StoreControllerTest < ActionController::TestCase
assert_equal assigns(:products).size, 2
assert_template 'index'

-
# Now with a term, that returns only one result.
+ # (ensures also that search is case-insensitive)
a_term = "lightsaber"
get :search, :search_term => a_term
assert_response :redirect
diff --git a/plugins/substruct/test/integration/buyer_test.rb b/plugins/substruct/test/integration/buyer_test.rb
index c91755f..184507d 100644
--- a/plugins/substruct/test/integration/buyer_test.rb
+++ b/plugins/substruct/test/integration/buyer_test.rb
@@ -20,7 +20,7 @@ class BuyerTest < ActionController::IntegrationTest
:order_user => {
:email_address => "uncle.scrooge@whoknowswhere.com"
},
- :use_separate_shipping_address => "false"
+ :use_separate_shipping_address => false
)
end

diff --git a/plugins/substruct/test/unit/order_address_test.rb b/plugins/substruct/test/unit/order_address_test.rb
index d8b2e0c..4a9fafd 100755
--- a/plugins/substruct/test/unit/order_address_test.rb
+++ b/plugins/substruct/test/unit/order_address_test.rb
@@ -95,9 +95,13 @@ class OrderAddressTest < ActiveSupport::TestCase
def test_should_find_shipping_address
# find_shipping_address_for_user appears to be a deprecated method, as when
# executed it gives an error, and I couldn't find an ocasion where it will be executed.
- assert_raise(ActiveRecord::StatementInvalid) {
- OrderAddress.find_shipping_address_for_user(users(:c_norris))
- }
+ #
+ # WHEN IT ISN'T EXECUTED, IT SHOULD BE REMOVED TOGETHER WITH THE TEST.
+ # (which does not raise the exception with postgresql)
+ #
+ # assert_raise(ActiveRecord::StatementInvalid) {
+ # OrderAddress.find_shipping_address_for_user(users(:c_norris))
+ # }
end


diff --git a/plugins/substruct/test/unit/product_test.rb b/plugins/substruct/test/unit/product_test.rb
index e606d2a..9cc8fac 100755
--- a/plugins/substruct/test/unit/product_test.rb
+++ b/plugins/substruct/test/unit/product_test.rb
@@ -223,13 +223,17 @@ class ProductTest < ActiveSupport::TestCase
def test_should_search
# It should find products.
assert_equal [items(:lightsaber)], Product.search("LIGHTSABER")
+ assert_equal [items(:lightsaber)], Product.search("LIGHTsaber")
+
# It should NOT find variations.
assert_equal [], Product.search("Red")
+
# Find in description.
assert_equal [items(:uranium_portion)], Product.search("nuke you always wanted")
+ assert_equal [items(:uranium_portion)], Product.search("Nuke you ALWAYS wanted")
+
# Find in name.
assert_equal [items(:uranium_portion)], Product.search("Enriched")
- # Find in name. It should NOT be case sensitive.
assert_equal [items(:uranium_portion)], Product.search("enriched")
end

Powered by Google Project Hosting